time_t stime;
struct tm tm;
int stat;
- char *JobId;
+ char JobId[30];
btime_t JobTDate;
char ed1[30];
strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm);
JobTDate = (btime_t)stime;
- P(mdb->mutex);
- JobId = db_next_index(mdb, "Job");
- if (!JobId) {
+ db_lock(mdb);
+ if (!db_next_index(mdb, "Job", JobId)) {
jr->JobId = 0;
- V(mdb->mutex);
+ db_unlock(mdb);
return 0;
}
/* Must create it */
Mmsg(&mdb->cmd,
-"INSERT INTO Job (JobId, Job, Name, Type, Level, SchedTime, JobTDate) VALUES \
-(%s, \"%s\", \"%s\", \"%c\", \"%c\", \"%s\", %s)",
- JobId, jr->Job, jr->Name, (char)(jr->Type), (char)(jr->Level), dt,
- edit_uint64(JobTDate, ed1));
+"INSERT INTO Job (JobId,Job,Name,Type,Level,JobStatus,SchedTime,JobTDate) VALUES \
+(%s,'%s','%s','%c','%c','%c','%s',%s)",
+ JobId, jr->Job, jr->Name, (char)(jr->Type), (char)(jr->Level),
+ (char)(jr->JobStatus), dt, edit_uint64(JobTDate, ed1));
if (!INSERT_DB(mdb, mdb->cmd)) {
Mmsg2(&mdb->errmsg, _("Create DB Job record %s failed. ERR=%s\n"),
jr->JobId = sql_insert_id(mdb);
stat = 1;
}
- V(mdb->mutex);
+ db_unlock(mdb);
return stat;
}
{
int stat;
- P(mdb->mutex);
+ db_lock(mdb);
Mmsg(&mdb->cmd, "SELECT JobId, MediaId FROM JobMedia WHERE \
JobId=%d AND MediaId=%d", jm->JobId, jm->MediaId);
if (mdb->num_rows > 0) {
Mmsg0(&mdb->errmsg, _("Create JobMedia failed. Record already exists.\n"));
sql_free_result(mdb);
- V(mdb->mutex);
+ db_unlock(mdb);
Dmsg0(0, "Already have JobMedia record\n");
return 0;
}
/* Must create it */
Mmsg(&mdb->cmd,
-"INSERT INTO JobMedia (JobId, MediaId, FirstIndex, LastIndex) \
-VALUES (%d, %d, %u, %u)",
- jm->JobId, jm->MediaId, jm->FirstIndex, jm->LastIndex);
+"INSERT INTO JobMedia (JobId,MediaId,FirstIndex,LastIndex,\
+StartFile,EndFile,StartBlock,EndBlock) \
+VALUES (%u,%u,%u,%u,%u,%u,%u,%u)",
+ jm->JobId, jm->MediaId, jm->FirstIndex, jm->LastIndex,
+ jm->StartFile, jm->EndFile, jm->StartBlock, jm->EndBlock);
Dmsg0(30, mdb->cmd);
if (!INSERT_DB(mdb, mdb->cmd)) {
} else {
stat = 1;
}
- V(mdb->mutex);
+ db_unlock(mdb);
Dmsg0(30, "Return from JobMedia\n");
return stat;
}
int stat;
char ed1[30];
- P(mdb->mutex);
- Mmsg(&mdb->cmd, "SELECT PoolId,Name FROM Pool WHERE Name=\"%s\"", pr->Name);
+ db_lock(mdb);
+ Mmsg(&mdb->cmd, "SELECT PoolId,Name FROM Pool WHERE Name='%s'", pr->Name);
Dmsg1(20, "selectpool: %s\n", mdb->cmd);
if (QUERY_DB(mdb, mdb->cmd)) {
if (mdb->num_rows > 0) {
Mmsg1(&mdb->errmsg, _("pool record %s already exists\n"), pr->Name);
sql_free_result(mdb);
- V(mdb->mutex);
+ db_unlock(mdb);
return 0;
}
sql_free_result(mdb);
Mmsg(&mdb->cmd,
"INSERT INTO Pool (Name, NumVols, MaxVols, UseOnce, UseCatalog, \
AcceptAnyVolume, AutoPrune, Recycle, VolRetention, PoolType, LabelFormat) \
-VALUES (\"%s\", %d, %d, %d, %d, %d, %d, %d, %s, \"%s\", \"%s\")",
+VALUES ('%s', %d, %d, %d, %d, %d, %d, %d, %s, '%s', '%s')",
pr->Name,
pr->NumVols, pr->MaxVols,
pr->UseOnce, pr->UseCatalog,
pr->PoolId = sql_insert_id(mdb);
stat = 1;
}
- V(mdb->mutex);
+ db_unlock(mdb);
return stat;
}
int stat;
char ed1[30], ed2[30], ed3[30];
- P(mdb->mutex);
- Mmsg(&mdb->cmd, "SELECT MediaId FROM Media WHERE VolumeName=\"%s\"",
+ db_lock(mdb);
+ Mmsg(&mdb->cmd, "SELECT MediaId FROM Media WHERE VolumeName='%s'",
mr->VolumeName);
Dmsg1(110, "selectpool: %s\n", mdb->cmd);
if (mdb->num_rows > 0) {
Mmsg1(&mdb->errmsg, _("Media record %s already exists\n"), mr->VolumeName);
sql_free_result(mdb);
- V(mdb->mutex);
+ db_unlock(mdb);
return 0;
}
sql_free_result(mdb);
/* Must create it */
Mmsg(&mdb->cmd,
-"INSERT INTO Media (VolumeName, MediaType, PoolId, VolMaxBytes, VolCapacityBytes, \
-Recycle, VolRetention, VolStatus) VALUES (\"%s\", \"%s\", %d, %s, %s, %d, %s, \"%s\")",
+"INSERT INTO Media (VolumeName,MediaType,PoolId,VolMaxBytes,VolCapacityBytes, \
+Recycle,VolRetention,VolStatus,Slot) VALUES ('%s', '%s', %d, %s, %s, %d, %s, '%s', %d)",
mr->VolumeName,
mr->MediaType, mr->PoolId,
edit_uint64(mr->VolMaxBytes,ed1),
edit_uint64(mr->VolCapacityBytes, ed2),
mr->Recycle,
edit_uint64(mr->VolRetention, ed3),
- mr->VolStatus);
+ mr->VolStatus,
+ mr->Slot);
Dmsg1(500, "Create Volume: %s\n", mdb->cmd);
if (!INSERT_DB(mdb, mdb->cmd)) {
mr->MediaId = sql_insert_id(mdb);
stat = 1;
}
- V(mdb->mutex);
+ db_unlock(mdb);
return stat;
}
int stat;
char ed1[30], ed2[30];
- P(mdb->mutex);
- Mmsg(&mdb->cmd, "SELECT ClientId FROM Client WHERE Name=\"%s\"", cr->Name);
+ db_lock(mdb);
+ Mmsg(&mdb->cmd, "SELECT ClientId,Uname FROM Client WHERE Name='%s'", cr->Name);
cr->ClientId = 0;
if (QUERY_DB(mdb, mdb->cmd)) {
/* If more than one, report error, but return first row */
if (mdb->num_rows > 1) {
Mmsg1(&mdb->errmsg, _("More than one Client!: %d\n"), (int)(mdb->num_rows));
- Emsg0(M_ERROR, 0, mdb->errmsg);
+ Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
}
if (mdb->num_rows >= 1) {
if ((row = sql_fetch_row(mdb)) == NULL) {
Mmsg1(&mdb->errmsg, _("error fetching Client row: %s\n"), sql_strerror(mdb));
- Emsg0(M_ERROR, 0, mdb->errmsg);
+ Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
sql_free_result(mdb);
- V(mdb->mutex);
+ db_unlock(mdb);
return 0;
}
- sql_free_result(mdb);
cr->ClientId = atoi(row[0]);
- V(mdb->mutex);
+ if (row[1]) {
+ strncpy(cr->Uname, row[1], sizeof(cr->Uname)-2);
+ cr->Uname[sizeof(cr->Uname)-1] = 0;
+ } else {
+ cr->Uname[0] = 0; /* no name */
+ }
+ sql_free_result(mdb);
+ db_unlock(mdb);
return 1;
}
sql_free_result(mdb);
/* Must create it */
Mmsg(&mdb->cmd, "INSERT INTO Client (Name, Uname, AutoPrune, \
FileRetention, JobRetention) VALUES \
-(\"%s\", \"%s\", %d, %s, %s)", cr->Name, cr->Uname, cr->AutoPrune,
+('%s', '%s', %d, %s, %s)", cr->Name, cr->Uname, cr->AutoPrune,
edit_uint64(cr->FileRetention, ed1),
edit_uint64(cr->JobRetention, ed2));
if (!INSERT_DB(mdb, mdb->cmd)) {
Mmsg2(&mdb->errmsg, _("Create DB Client record %s failed. ERR=%s\n"),
mdb->cmd, sql_strerror(mdb));
+ Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
cr->ClientId = 0;
stat = 0;
} else {
cr->ClientId = sql_insert_id(mdb);
stat = 1;
}
- V(mdb->mutex);
+ db_unlock(mdb);
return stat;
}
SQL_ROW row;
int stat;
- P(mdb->mutex);
+ db_lock(mdb);
Mmsg(&mdb->cmd, "SELECT FileSetId FROM FileSet WHERE \
-FileSet=\"%s\" and MD5=\"%s\"", fsr->FileSet, fsr->MD5);
+FileSet='%s' and MD5='%s'", fsr->FileSet, fsr->MD5);
fsr->FileSetId = 0;
if (QUERY_DB(mdb, mdb->cmd)) {
if (mdb->num_rows > 1) {
Mmsg1(&mdb->errmsg, _("More than one FileSet!: %d\n"), (int)(mdb->num_rows));
- Emsg0(M_ERROR, 0, mdb->errmsg);
+ Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
}
if (mdb->num_rows >= 1) {
if ((row = sql_fetch_row(mdb)) == NULL) {
Mmsg1(&mdb->errmsg, _("error fetching FileSet row: ERR=%s\n"), sql_strerror(mdb));
- Emsg0(M_ERROR, 0, mdb->errmsg);
+ Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
sql_free_result(mdb);
- V(mdb->mutex);
+ db_unlock(mdb);
return 0;
}
- sql_free_result(mdb);
fsr->FileSetId = atoi(row[0]);
- V(mdb->mutex);
+ sql_free_result(mdb);
+ db_unlock(mdb);
return 1;
}
sql_free_result(mdb);
/* Must create it */
Mmsg(&mdb->cmd, "INSERT INTO FileSet (FileSet, MD5) VALUES \
-(\"%s\", \"%s\")", fsr->FileSet, fsr->MD5);
+('%s', '%s')", fsr->FileSet, fsr->MD5);
if (!INSERT_DB(mdb, mdb->cmd)) {
Mmsg2(&mdb->errmsg, _("Create DB FileSet record %s failed. ERR=%s\n"),
mdb->cmd, sql_strerror(mdb));
+ Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
fsr->FileSetId = 0;
stat = 0;
} else {
stat = 1;
}
- V(mdb->mutex);
+ db_unlock(mdb);
return stat;
}
/* For the moment, we only handle Unix attributes. Note, we are
* also getting any MD5 signature that was computed.
*/
- if (ar->Stream != STREAM_UNIX_ATTRIBUTES) {
+ if (!(ar->Stream == STREAM_UNIX_ATTRIBUTES || ar->Stream == STREAM_WIN32_ATTRIBUTES)) {
Mmsg0(&mdb->errmsg, _("Attempt to put non-attributes into catalog\n"));
+ Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
return 0;
}
*/
fnl = p - l;
if (fnl > 255) {
- Emsg1(M_WARNING, 0, _("Filename truncated to 255 chars: %s\n"), l);
+ Jmsg(mdb->jcr, M_WARNING, 0, _("Filename truncated to 255 chars: %s\n"), l);
fnl = 255;
}
if (fnl > 0) {
} else {
file[0] = ' '; /* blank filename */
file[1] = 0;
+ fnl = 1;
}
pnl = l - ar->fname;
if (pnl > 255) {
- Emsg1(M_WARNING, 0, _("Path name truncated to 255 chars: %s\n"), ar->fname);
+ Jmsg(mdb->jcr, M_WARNING, 0, _("Path name truncated to 255 chars: %s\n"), ar->fname);
pnl = 255;
}
strncpy(spath, ar->fname, pnl);
if (pnl == 0) {
Mmsg1(&mdb->errmsg, _("Path length is zero. File=%s\n"), ar->fname);
- Emsg0(M_ERROR, 0, mdb->errmsg);
+ Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
spath[0] = ' ';
spath[1] = 0;
+ pnl = 1;
}
Dmsg1(100, "spath=%s\n", spath);
Dmsg0(50, "db_create_file_record\n");
Dmsg3(100, "Path=%s File=%s FilenameId=%d\n", spath, file, ar->FilenameId);
-
return 1;
}
{
int stat;
- P(mdb->mutex);
+ ASSERT(ar->JobId);
+ ASSERT(ar->PathId);
+ ASSERT(ar->FilenameId);
+
+ db_lock(mdb);
/* Must create it */
Mmsg(&mdb->cmd,
"INSERT INTO File (FileIndex, JobId, PathId, FilenameId, \
-LStat, MD5) VALUES (%d, %d, %d, %d, \"%s\", \"0\")",
- (int)ar->FileIndex, ar->JobId, ar->PathId, ar->FilenameId,
+LStat, MD5) VALUES (%u, %u, %u, %u, '%s', '0')",
+ ar->FileIndex, ar->JobId, ar->PathId, ar->FilenameId,
ar->attr);
if (!INSERT_DB(mdb, mdb->cmd)) {
Mmsg2(&mdb->errmsg, _("Create db File record %s failed. ERR=%s"),
mdb->cmd, sql_strerror(mdb));
- Emsg1(M_ERROR, 0, "%s", mdb->errmsg);
+ Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
ar->FileId = 0;
stat = 0;
} else {
ar->FileId = sql_insert_id(mdb);
stat = 1;
}
- V(mdb->mutex);
+ db_unlock(mdb);
return stat;
}
static int db_create_path_record(B_DB *mdb, ATTR_DBR *ar, char *path)
{
SQL_ROW row;
- static uint32_t cached_id = 0;
- static char cached_path[MAXSTRING];
int stat;
if (*path == 0) {
Mmsg0(&mdb->errmsg, _("Null path given to db_create_path_record\n"));
- Emsg0(M_ERROR, 0, mdb->errmsg);
+ Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
ar->PathId = 0;
+ ASSERT(ar->PathId);
return 0;
}
- P(mdb->mutex);
+ db_lock(mdb);
- if (cached_id != 0 && strcmp(cached_path, path) == 0) {
- ar->PathId = cached_id;
- V(mdb->mutex);
+ if (mdb->cached_path_id != 0 && strcmp(mdb->cached_path, path) == 0) {
+ ar->PathId = mdb->cached_path_id;
+ ASSERT(ar->PathId);
+ db_unlock(mdb);
return 1;
- }
+ }
- Mmsg(&mdb->cmd, "SELECT PathId FROM Path WHERE Path=\"%s\"", path);
+ Mmsg(&mdb->cmd, "SELECT PathId FROM Path WHERE Path='%s'", path);
if (QUERY_DB(mdb, mdb->cmd)) {
char ed1[30];
Mmsg2(&mdb->errmsg, _("More than one Path!: %s for Path=%s\n"),
edit_uint64(mdb->num_rows, ed1), path);
- Emsg1(M_ERROR, 0, "%s", mdb->errmsg);
- Emsg1(M_ERROR, 0, "%s\n", mdb->cmd);
+ Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
}
if (mdb->num_rows >= 1) {
if ((row = sql_fetch_row(mdb)) == NULL) {
- V(mdb->mutex);
+ db_unlock(mdb);
Mmsg1(&mdb->errmsg, _("error fetching row: %s\n"), sql_strerror(mdb));
- Emsg0(M_ERROR, 0, mdb->errmsg);
+ Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
sql_free_result(mdb);
ar->PathId = 0;
+ ASSERT(ar->PathId);
return 0;
}
- sql_free_result(mdb);
ar->PathId = atoi(row[0]);
- if (ar->PathId != cached_id) {
- cached_id = ar->PathId;
- strncpy(cached_path, path, sizeof(cached_path));
- cached_path[sizeof(cached_path)-1] = 0;
+ sql_free_result(mdb);
+ /* Cache path */
+ if (ar->PathId != mdb->cached_path_id) {
+ mdb->cached_path_id = ar->PathId;
+ mdb->cached_path = check_pool_memory_size(mdb->cached_path,
+ strlen(path)+1);
+ strcpy(mdb->cached_path, path);
}
- V(mdb->mutex);
+ ASSERT(ar->PathId);
+ db_unlock(mdb);
return 1;
}
sql_free_result(mdb);
}
- Mmsg(&mdb->cmd, "INSERT INTO Path (Path) VALUES (\"%s\")", path);
+ Mmsg(&mdb->cmd, "INSERT INTO Path (Path) VALUES ('%s')", path);
if (!INSERT_DB(mdb, mdb->cmd)) {
Mmsg2(&mdb->errmsg, _("Create db Path record %s failed. ERR=%s\n"),
mdb->cmd, sql_strerror(mdb));
- Emsg1(M_ERROR, 0, "%s", mdb->errmsg);
+ Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
ar->PathId = 0;
stat = 0;
} else {
stat = 1;
}
- if (ar->PathId != cached_id) {
- cached_id = ar->PathId;
- strncpy(cached_path, path, sizeof(cached_path));
- cached_path[sizeof(cached_path)-1] = 0;
+ /* Cache path */
+ if (ar->PathId != mdb->cached_path_id) {
+ mdb->cached_path_id = ar->PathId;
+ mdb->cached_path = check_pool_memory_size(mdb->cached_path,
+ strlen(path)+1);
+ strcpy(mdb->cached_path, path);
}
- V(mdb->mutex);
+ ASSERT(ar->PathId);
+ db_unlock(mdb);
return stat;
}
static int db_create_filename_record(B_DB *mdb, ATTR_DBR *ar, char *fname)
{
SQL_ROW row;
- int stat;
- P(mdb->mutex);
- Mmsg(&mdb->cmd, "SELECT FilenameId FROM Filename WHERE Name=\"%s\"", fname);
+ db_lock(mdb);
+ Mmsg(&mdb->cmd, "SELECT FilenameId FROM Filename WHERE Name='%s'", fname);
if (QUERY_DB(mdb, mdb->cmd)) {
mdb->num_rows = sql_num_rows(mdb);
if (mdb->num_rows > 1) {
Mmsg2(&mdb->errmsg, _("More than one Filename!: %d File=%s\n"),
(int)(mdb->num_rows), fname);
- Emsg1(M_ERROR, 0, "%s", mdb->errmsg);
- Emsg1(M_ERROR, 0, "%s\n", mdb->cmd);
+ Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
}
if (mdb->num_rows >= 1) {
if ((row = sql_fetch_row(mdb)) == NULL) {
Mmsg2(&mdb->errmsg, _("error fetching row for file=%s: ERR=%s\n"),
fname, sql_strerror(mdb));
- sql_free_result(mdb);
- V(mdb->mutex);
- Emsg0(M_ERROR, 0, mdb->errmsg);
+ Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
ar->FilenameId = 0;
- return 0;
+ } else {
+ ar->FilenameId = atoi(row[0]);
}
sql_free_result(mdb);
- ar->FilenameId = atoi(row[0]);
- V(mdb->mutex);
- return 1;
+ db_unlock(mdb);
+ return ar->FilenameId > 0;
}
sql_free_result(mdb);
}
Mmsg(&mdb->cmd, "INSERT INTO Filename (Name) \
-VALUES (\"%s\")", fname);
+VALUES ('%s')", fname);
if (!INSERT_DB(mdb, mdb->cmd)) {
Mmsg2(&mdb->errmsg, _("Create db Filename record %s failed. ERR=%s\n"),
mdb->cmd, sql_strerror(mdb));
- Emsg1(M_ERROR, 0, "%s", mdb->errmsg);
+ Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
ar->FilenameId = 0;
- stat = 0;
} else {
ar->FilenameId = sql_insert_id(mdb);
- stat = 1;
}
- V(mdb->mutex);
- return stat;
+ db_unlock(mdb);
+ return ar->FilenameId > 0;
}
#endif /* HAVE_MYSQL || HAVE_SQLITE */
projects / bacula / bacula / blobdiff