cats: changing queries to show duration and applying create_queryfiles

bareos · Dec 3, 2021 · a859bcc · a859bcc
1 parent bdf9f60
commit a859bcc
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 22 deletions.
diff --git a/core/src/cats/dml/0006_list_jobs b/core/src/cats/dml/0006_list_jobs
@@ -5,7 +5,12 @@
 # JOIN with Media is required for filter to Media.Volumename.
 #
 SELECT DISTINCT Job.JobId,Job.Name, Client.Name as Client,
-Job.StartTime,Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus
+Job.StartTime,
+CASE
+  WHEN endtime IS NOT NULL THEN endtime - starttime
+  ELSE CURRENT_TIMESTAMP - starttime
+  END as Duration,
+Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus
 FROM Job
 LEFT JOIN Client ON Client.ClientId=Job.ClientId
 LEFT JOIN JobMedia ON JobMedia.JobId=Job.JobId

diff --git a/core/src/cats/dml/0007_list_jobs_long b/core/src/cats/dml/0007_list_jobs_long
@@ -7,7 +7,12 @@
 
 SELECT DISTINCT Job.JobId, Job.Job, Job.Name, Job.PurgedFiles, Job.Type, Job.Level,
 Job.ClientId, Client.Name as Client, Job.JobStatus, Job.SchedTime, Job.StartTime,
-Job.EndTime, Job.RealEndTime, Job.JobTDate, Job.VolSessionId, Job.VolSessionTime,
+Job.EndTime,
+CASE
+  WHEN endtime IS NOT NULL THEN endtime - starttime
+  ELSE CURRENT_TIMESTAMP - starttime
+  END as Duration,
+Job.JobTDate, Job.VolSessionId, Job.VolSessionTime,
 Job.JobFiles, Job.JobBytes, Job.JobErrors, Job.JobMissingFiles, Job.PoolId,
 Pool.Name as PoolName, Job.PriorJobId, Job.FileSetId, FileSet.FileSet
 FROM Job

diff --git a/core/src/cats/dml/0009_list_jobs_last b/core/src/cats/dml/0009_list_jobs_last
@@ -3,7 +3,12 @@
 #                   (all filters starts with "AND ...")
 
 SELECT DISTINCT Job.JobId,Job.Name, Client.Name as Client,
-Job.StartTime,Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus
+Job.StartTime,
+CASE
+  WHEN endtime IS NOT NULL THEN endtime - starttime
+  ELSE CURRENT_TIMESTAMP - starttime
+  END as Duration,
+Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus
 FROM Job
 LEFT JOIN Client ON Client.ClientId=Job.ClientId
 LEFT JOIN JobMedia ON JobMedia.JobId=Job.JobId

diff --git a/core/src/cats/dml/0010_list_jobs_long_last b/core/src/cats/dml/0010_list_jobs_long_last
@@ -4,7 +4,12 @@
 
 SELECT DISTINCT Job.JobId, Job.Job, Job.Name, Job.PurgedFiles, Job.Type, Job.Level,
 Job.ClientId, Client.Name as Client, Job.JobStatus, Job.SchedTime, Job.StartTime,
-Job.EndTime, Job.RealEndTime, Job.JobTDate, Job.VolSessionId, Job.VolSessionTime,
+Job.EndTime, Job.RealEndTime,
+CASE
+  WHEN endtime IS NOT NULL THEN endtime - starttime
+  ELSE CURRENT_TIMESTAMP - starttime
+  END as Duration,
+Job.JobTDate, Job.VolSessionId, Job.VolSessionTime,
 Job.JobFiles, Job.JobBytes, Job.JobErrors, Job.JobMissingFiles, Job.PoolId,
 Pool.Name as PoolName, Job.PriorJobId, Job.FileSetId, FileSet.FileSet
 FROM Job

diff --git a/core/src/cats/mysql_queries.inc b/core/src/cats/mysql_queries.inc
@@ -51,7 +51,12 @@ const char *BareosDbMysql::query_definitions[] = {
 
 /* 0006_list_jobs */
 "SELECT DISTINCT Job.JobId,Job.Name, Client.Name as Client, "
-"Job.StartTime,Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus "
+"Job.StartTime, "
+"CASE "
+  "WHEN endtime IS NOT NULL THEN endtime - starttime "
+  "ELSE CURRENT_TIMESTAMP - starttime "
+  "END as Duration, "
+"Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus "
 "FROM Job "
 "LEFT JOIN Client ON Client.ClientId=Job.ClientId "
 "LEFT JOIN JobMedia ON JobMedia.JobId=Job.JobId "
@@ -65,7 +70,12 @@ const char *BareosDbMysql::query_definitions[] = {
 /* 0007_list_jobs_long */
 "SELECT DISTINCT Job.JobId, Job.Job, Job.Name, Job.PurgedFiles, Job.Type, Job.Level, "
 "Job.ClientId, Client.Name as Client, Job.JobStatus, Job.SchedTime, Job.StartTime, "
-"Job.EndTime, Job.RealEndTime, Job.JobTDate, Job.VolSessionId, Job.VolSessionTime, "
+"Job.EndTime, "
+"CASE "
+  "WHEN endtime IS NOT NULL THEN endtime - starttime "
+  "ELSE CURRENT_TIMESTAMP - starttime "
+  "END as Duration, "
+"Job.JobTDate, Job.VolSessionId, Job.VolSessionTime, "
 "Job.JobFiles, Job.JobBytes, Job.JobErrors, Job.JobMissingFiles, Job.PoolId, "
 "Pool.Name as PoolName, Job.PriorJobId, Job.FileSetId, FileSet.FileSet "
 "FROM Job "
@@ -93,7 +103,12 @@ const char *BareosDbMysql::query_definitions[] = {
 
 /* 0009_list_jobs_last */
 "SELECT DISTINCT Job.JobId,Job.Name, Client.Name as Client, "
-"Job.StartTime,Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus "
+"Job.StartTime, "
+"CASE "
+  "WHEN endtime IS NOT NULL THEN endtime - starttime "
+  "ELSE CURRENT_TIMESTAMP - starttime "
+  "END as Duration, "
+"Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus "
 "FROM Job "
 "LEFT JOIN Client ON Client.ClientId=Job.ClientId "
 "LEFT JOIN JobMedia ON JobMedia.JobId=Job.JobId "
@@ -118,7 +133,12 @@ const char *BareosDbMysql::query_definitions[] = {
 /* 0010_list_jobs_long_last */
 "SELECT DISTINCT Job.JobId, Job.Job, Job.Name, Job.PurgedFiles, Job.Type, Job.Level, "
 "Job.ClientId, Client.Name as Client, Job.JobStatus, Job.SchedTime, Job.StartTime, "
-"Job.EndTime, Job.RealEndTime, Job.JobTDate, Job.VolSessionId, Job.VolSessionTime, "
+"Job.EndTime, Job.RealEndTime, "
+"CASE "
+  "WHEN endtime IS NOT NULL THEN endtime - starttime "
+  "ELSE CURRENT_TIMESTAMP - starttime "
+  "END as Duration, "
+"Job.JobTDate, Job.VolSessionId, Job.VolSessionTime, "
 "Job.JobFiles, Job.JobBytes, Job.JobErrors, Job.JobMissingFiles, Job.PoolId, "
 "Pool.Name as PoolName, Job.PriorJobId, Job.FileSetId, FileSet.FileSet "
 "FROM Job "
@@ -894,9 +914,7 @@ const char *BareosDbMysql::query_definitions[] = {
 "SELECT 'D', SpecialDir.PathId, SpecialDir.Path, JobId, LStat, FileId "
 "FROM ( "
     "SELECT %s AS PathId, '.' AS Path "
-    " "
     "UNION "
-    " "
     "SELECT PPathId AS PathId, '..' AS Path "
     "FROM   PathHierarchy "
     "WHERE  PathId = %s "

diff --git a/core/src/cats/postgresql_queries.inc b/core/src/cats/postgresql_queries.inc
@@ -51,7 +51,12 @@ const char *BareosDbPostgresql::query_definitions[] = {
 
 /* 0006_list_jobs */
 "SELECT DISTINCT Job.JobId,Job.Name, Client.Name as Client, "
-"Job.StartTime,Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus "
+"Job.StartTime, "
+"CASE "
+  "WHEN endtime IS NOT NULL THEN endtime - starttime "
+  "ELSE CURRENT_TIMESTAMP - starttime "
+  "END as Duration, "
+"Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus "
 "FROM Job "
 "LEFT JOIN Client ON Client.ClientId=Job.ClientId "
 "LEFT JOIN JobMedia ON JobMedia.JobId=Job.JobId "
@@ -65,7 +70,12 @@ const char *BareosDbPostgresql::query_definitions[] = {
 /* 0007_list_jobs_long */
 "SELECT DISTINCT Job.JobId, Job.Job, Job.Name, Job.PurgedFiles, Job.Type, Job.Level, "
 "Job.ClientId, Client.Name as Client, Job.JobStatus, Job.SchedTime, Job.StartTime, "
-"Job.EndTime, Job.RealEndTime, Job.JobTDate, Job.VolSessionId, Job.VolSessionTime, "
+"Job.EndTime, "
+"CASE "
+  "WHEN endtime IS NOT NULL THEN endtime - starttime "
+  "ELSE CURRENT_TIMESTAMP - starttime "
+  "END as Duration, "
+"Job.JobTDate, Job.VolSessionId, Job.VolSessionTime, "
 "Job.JobFiles, Job.JobBytes, Job.JobErrors, Job.JobMissingFiles, Job.PoolId, "
 "Pool.Name as PoolName, Job.PriorJobId, Job.FileSetId, FileSet.FileSet "
 "FROM Job "
@@ -93,7 +103,12 @@ const char *BareosDbPostgresql::query_definitions[] = {
 
 /* 0009_list_jobs_last */
 "SELECT DISTINCT Job.JobId,Job.Name, Client.Name as Client, "
-"Job.StartTime,Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus "
+"Job.StartTime, "
+"CASE "
+  "WHEN endtime IS NOT NULL THEN endtime - starttime "
+  "ELSE CURRENT_TIMESTAMP - starttime "
+  "END as Duration, "
+"Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus "
 "FROM Job "
 "LEFT JOIN Client ON Client.ClientId=Job.ClientId "
 "LEFT JOIN JobMedia ON JobMedia.JobId=Job.JobId "
@@ -118,7 +133,12 @@ const char *BareosDbPostgresql::query_definitions[] = {
 /* 0010_list_jobs_long_last */
 "SELECT DISTINCT Job.JobId, Job.Job, Job.Name, Job.PurgedFiles, Job.Type, Job.Level, "
 "Job.ClientId, Client.Name as Client, Job.JobStatus, Job.SchedTime, Job.StartTime, "
-"Job.EndTime, Job.RealEndTime, Job.JobTDate, Job.VolSessionId, Job.VolSessionTime, "
+"Job.EndTime, Job.RealEndTime, "
+"CASE "
+  "WHEN endtime IS NOT NULL THEN endtime - starttime "
+  "ELSE CURRENT_TIMESTAMP - starttime "
+  "END as Duration, "
+"Job.JobTDate, Job.VolSessionId, Job.VolSessionTime, "
 "Job.JobFiles, Job.JobBytes, Job.JobErrors, Job.JobMissingFiles, Job.PoolId, "
 "Pool.Name as PoolName, Job.PriorJobId, Job.FileSetId, FileSet.FileSet "
 "FROM Job "
@@ -869,9 +889,7 @@ const char *BareosDbPostgresql::query_definitions[] = {
 "SELECT DISTINCT ON (PathId) 'D', SpecialDir.PathId, SpecialDir.Path, JobId, LStat, FileId "
 "FROM ( "
     "SELECT %s AS PathId, '.' AS Path "
-    " "
     "UNION "
-    " "
     "SELECT PPathId AS PathId, '..' AS Path "
     "FROM   PathHierarchy "
     "WHERE  PathId = %s "

diff --git a/core/src/cats/sqlite_queries.inc b/core/src/cats/sqlite_queries.inc
@@ -51,7 +51,12 @@ const char *BareosDbSqlite::query_definitions[] = {
 
 /* 0006_list_jobs */
 "SELECT DISTINCT Job.JobId,Job.Name, Client.Name as Client, "
-"Job.StartTime,Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus "
+"Job.StartTime, "
+"CASE "
+  "WHEN endtime IS NOT NULL THEN endtime - starttime "
+  "ELSE CURRENT_TIMESTAMP - starttime "
+  "END as Duration, "
+"Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus "
 "FROM Job "
 "LEFT JOIN Client ON Client.ClientId=Job.ClientId "
 "LEFT JOIN JobMedia ON JobMedia.JobId=Job.JobId "
@@ -65,7 +70,12 @@ const char *BareosDbSqlite::query_definitions[] = {
 /* 0007_list_jobs_long */
 "SELECT DISTINCT Job.JobId, Job.Job, Job.Name, Job.PurgedFiles, Job.Type, Job.Level, "
 "Job.ClientId, Client.Name as Client, Job.JobStatus, Job.SchedTime, Job.StartTime, "
-"Job.EndTime, Job.RealEndTime, Job.JobTDate, Job.VolSessionId, Job.VolSessionTime, "
+"Job.EndTime, "
+"CASE "
+  "WHEN endtime IS NOT NULL THEN endtime - starttime "
+  "ELSE CURRENT_TIMESTAMP - starttime "
+  "END as Duration, "
+"Job.JobTDate, Job.VolSessionId, Job.VolSessionTime, "
 "Job.JobFiles, Job.JobBytes, Job.JobErrors, Job.JobMissingFiles, Job.PoolId, "
 "Pool.Name as PoolName, Job.PriorJobId, Job.FileSetId, FileSet.FileSet "
 "FROM Job "
@@ -93,7 +103,12 @@ const char *BareosDbSqlite::query_definitions[] = {
 
 /* 0009_list_jobs_last */
 "SELECT DISTINCT Job.JobId,Job.Name, Client.Name as Client, "
-"Job.StartTime,Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus "
+"Job.StartTime, "
+"CASE "
+  "WHEN endtime IS NOT NULL THEN endtime - starttime "
+  "ELSE CURRENT_TIMESTAMP - starttime "
+  "END as Duration, "
+"Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus "
 "FROM Job "
 "LEFT JOIN Client ON Client.ClientId=Job.ClientId "
 "LEFT JOIN JobMedia ON JobMedia.JobId=Job.JobId "
@@ -118,7 +133,12 @@ const char *BareosDbSqlite::query_definitions[] = {
 /* 0010_list_jobs_long_last */
 "SELECT DISTINCT Job.JobId, Job.Job, Job.Name, Job.PurgedFiles, Job.Type, Job.Level, "
 "Job.ClientId, Client.Name as Client, Job.JobStatus, Job.SchedTime, Job.StartTime, "
-"Job.EndTime, Job.RealEndTime, Job.JobTDate, Job.VolSessionId, Job.VolSessionTime, "
+"Job.EndTime, Job.RealEndTime, "
+"CASE "
+  "WHEN endtime IS NOT NULL THEN endtime - starttime "
+  "ELSE CURRENT_TIMESTAMP - starttime "
+  "END as Duration, "
+"Job.JobTDate, Job.VolSessionId, Job.VolSessionTime, "
 "Job.JobFiles, Job.JobBytes, Job.JobErrors, Job.JobMissingFiles, Job.PoolId, "
 "Pool.Name as PoolName, Job.PriorJobId, Job.FileSetId, FileSet.FileSet "
 "FROM Job "
@@ -879,9 +899,7 @@ const char *BareosDbSqlite::query_definitions[] = {
 "SELECT 'D', SpecialDir.PathId, SpecialDir.Path, JobId, LStat, FileId "
 "FROM ( "
     "SELECT %s AS PathId, '.' AS Path "
-    " "
     "UNION "
-    " "
     "SELECT PPathId AS PathId, '..' AS Path "
     "FROM   PathHierarchy "
     "WHERE  PathId = %s "