sqlqueries: fix core/src/cats/dml/create_queryfiles.sh

The name of the BareosDB class was changed but the query create script was not adapted to that fact. This is now fixed and the queries were created anew. Also changed GetQuotaJobbytes and GetQuotaJobbytesNofailed back to the old name because that is the same name as the query file has.
bareos · Sep 18, 2018 · bc0f734 · bc0f734
1 parent a24b842
commit bc0f734
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/core/src/cats/bdb_query_names.inc b/core/src/cats/bdb_query_names.inc
@@ -59,8 +59,8 @@ const char *BareosDb::query_names[] = {
 "insert_counter_values",
 "select_counter_values",
 "update_counter_values",
-"GetQuotaJobbytes",
-"GetQuotaJobbytesNofailed",
+"get_quota_jobbytes",
+"get_quota_jobbytes_nofailed",
 "uar_sel_jobid_copies",
 "get_jobstatus_details",
 "bvfs_versions_6",

diff --git a/core/src/cats/cats.h b/core/src/cats/cats.h
@@ -713,8 +713,8 @@ class CATS_IMP_EXP BareosDb: public SmartAlloc, public BareosDbQueryEnum {
    bool AccurateGetJobids(JobControlRecord *jcr, JobDbRecord *jr, db_list_ctx *jobids);
    bool GetUsedBaseJobids(JobControlRecord *jcr, POOLMEM *jobids, db_list_ctx *result);
    bool GetQuotaRecord(JobControlRecord *jcr, ClientDbRecord *cr);
-   bool GetQuotaJobbytes(JobControlRecord *jcr, JobDbRecord *jr, utime_t JobRetention);
-   bool GetQuotaJobbytesNofailed(JobControlRecord *jcr, JobDbRecord *jr, utime_t JobRetention);
+   bool get_quota_jobbytes(JobControlRecord *jcr, JobDbRecord *jr, utime_t JobRetention);
+   bool get_quota_jobbytes_nofailed(JobControlRecord *jcr, JobDbRecord *jr, utime_t JobRetention);
    int GetNdmpLevelMapping(JobControlRecord *jcr, JobDbRecord *jr, char *filesystem);
    bool GetNdmpEnvironmentString(JobControlRecord *jcr, JobDbRecord *jr, DB_RESULT_HANDLER *ResultHandler, void *ctx);
    bool GetNdmpEnvironmentString(JobControlRecord *jcr, JobId_t JobId, DB_RESULT_HANDLER *ResultHandler, void *ctx);

diff --git a/core/src/cats/dml/create_queryfiles.sh b/core/src/cats/dml/create_queryfiles.sh
@@ -54,11 +54,11 @@ EOF
 
 
 for db in $DATABASES; do
-    DB=`upper $db`
+    DB=${db^}
     queryincludefile=`get_query_include_filename $db`
     > $queryincludefile
     printf "%s\n\n" "$NOTE" >> $queryincludefile
-    printf "const char *B_DB_%s::query_definitions[] = {\n" "$DB" >> $queryincludefile
+    printf "const char *BareosDb%s::query_definitions[] = {\n" "$DB" >> $queryincludefile
 done
 
 #

diff --git a/core/src/cats/mysql_queries.inc b/core/src/cats/mysql_queries.inc
@@ -873,13 +873,11 @@ const char *BareosDbMysql::query_definitions[] = {
 "WHERE Log.JobId=%s "
 ,
 
-/* 0072_get_orphaned_paths_0 */
-"SELECT DISTINCT Path.PathId, File.PathId, Path.Path "
-"FROM Path "
-"LEFT JOIN File USING (PathId) "
-"LEFT JOIN PathHierarchy ON (Path.Pathid = PathHierarchy.PPathId) "
+/* 0072_get_orphaned_paths_0.mysql */
+"SELECT DISTINCT ParentPath.PathId,File.PathId,ParentPath.Path "
+"FROM Path AS ParentPath LEFT OUTER JOIN File USING(PathId) "
 "WHERE File.PathId IS NULL "
-  "AND PathHierarchy.PPathId IS NULL "
+  "AND NOT EXISTS (SELECT 1 FROM Path WHERE Path LIKE CONCAT(ParentPath.Path,'_%%')) "
 "LIMIT 300000 "
 ,
 

diff --git a/core/src/cats/sql_get.cc b/core/src/cats/sql_get.cc
@@ -1451,7 +1451,7 @@ bool BareosDb::GetVolumeJobids(JobControlRecord *jcr, MediaDbRecord *mr, db_list
  * Returns false: on failure
  *         true: on success
  */
-bool BareosDb::GetQuotaJobbytes(JobControlRecord *jcr, JobDbRecord *jr, utime_t JobRetention)
+bool BareosDb::get_quota_jobbytes(JobControlRecord *jcr, JobDbRecord *jr, utime_t JobRetention)
 {
    SQL_ROW row;
    int num_rows;
@@ -1503,7 +1503,7 @@ bool BareosDb::GetQuotaJobbytes(JobControlRecord *jcr, JobDbRecord *jr, utime_t
  * Returns false: on failure
  *         true: on success
  */
-bool BareosDb::GetQuotaJobbytesNofailed(JobControlRecord *jcr, JobDbRecord *jr, utime_t JobRetention)
+bool BareosDb::get_quota_jobbytes_nofailed(JobControlRecord *jcr, JobDbRecord *jr, utime_t JobRetention)
 {
    SQL_ROW row;
    char ed1[50], ed2[50];

diff --git a/core/src/dird/quota.cc b/core/src/dird/quota.cc
@@ -115,12 +115,12 @@ bool CheckHardquotas(JobControlRecord *jcr)
    Dmsg1(debuglevel, "Checking hard quotas for JobId %d\n", jcr->JobId);
    if (!jcr->HasQuota) {
       if (jcr->res.client->QuotaIncludeFailedJobs) {
-         if (!jcr->db->GetQuotaJobbytes(jcr, &jcr->jr, jcr->res.client->JobRetention)) {
+         if (!jcr->db->get_quota_jobbytes(jcr, &jcr->jr, jcr->res.client->JobRetention)) {
             Jmsg(jcr, M_WARNING, 0, _("Error getting Quota value: ERR=%s"), jcr->db->strerror());
             goto bail_out;
          }
       } else {
-         if (!jcr->db->GetQuotaJobbytesNofailed(jcr, &jcr->jr, jcr->res.client->JobRetention)) {
+         if (!jcr->db->get_quota_jobbytes_nofailed(jcr, &jcr->jr, jcr->res.client->JobRetention)) {
             Jmsg(jcr, M_WARNING, 0, _("Error getting Quota value: ERR=%s"), jcr->db->strerror());
             goto bail_out;
          }
@@ -168,13 +168,13 @@ bool CheckSoftquotas(JobControlRecord *jcr)
    Dmsg1(debuglevel, "Checking soft quotas for JobId %d\n", jcr->JobId);
    if (!jcr->HasQuota) {
       if (jcr->res.client->QuotaIncludeFailedJobs) {
-         if (!jcr->db->GetQuotaJobbytes(jcr, &jcr->jr, jcr->res.client->JobRetention)) {
+         if (!jcr->db->get_quota_jobbytes(jcr, &jcr->jr, jcr->res.client->JobRetention)) {
             Jmsg(jcr, M_WARNING, 0, _("Error getting Quota value: ERR=%s"), jcr->db->strerror());
             goto bail_out;
          }
          Dmsg0(debuglevel, "Quota Includes Failed Jobs\n");
       } else {
-         if (!jcr->db->GetQuotaJobbytesNofailed(jcr, &jcr->jr, jcr->res.client->JobRetention)) {
+         if (!jcr->db->get_quota_jobbytes_nofailed(jcr, &jcr->jr, jcr->res.client->JobRetention)) {
             Jmsg(jcr, M_WARNING, 0, _("Error getting Quota value: ERR=%s"), jcr->db->strerror());
             goto bail_out;
          }