Updated the TapeStatisticsUpdater::updateTapeStatistics() sql query to take...

Updated the TapeStatisticsUpdater::updateTapeStatistics() sql query to take into account the NB_COPY_NB_1, COPY_NB_1_IN_BYTES, NB_COPY_NB_GT_1, COPY_NB_GT_1_IN_BYTES columns of the TAPE table

statistics/TapeStatisticsUpdater.cpp

@@ -34,21 +34,21 @@ void TapeStatisticsUpdater::updateTapeStatistics() {
     "DIRTY,"
     "NB_MASTER_FILES,"
     "MASTER_DATA_IN_BYTES,"
-    "NB_COPY_NB1,"
-    "COPY_NB1_IN_BYTES,"
-    "NB_COPY_NB_GT1,"
-    "COPY_NB_GT1_IN_BYTES"
+    "NB_COPY_NB_1,"
+    "COPY_NB_1_IN_BYTES,"
+    "NB_COPY_NB_GT_1,"
+    "COPY_NB_GT_1_IN_BYTES"
   ")"
   " = "
   "("
     "SELECT "
       "'0' AS DIRTY,"
-      "COALESCE(NON_EMPTY_TAPE_STATS.NB_MASTER_FILES, 0) AS NB_MASTER_FILES,"
-      "COALESCE(NON_EMPTY_TAPE_STATS.MASTER_DATA_IN_BYTES, 0) AS MASTER_DATA_IN_BYTES,"
-      "IF COPY_NB = 1 THEN COALESCE(NON_EMPTY_TAPE_STATS.NB_MASTER_FILES, 0) AS NB_COPY_NB1,"
-      "IF COPY_NB = 1 THEN COALESCE(NON_EMPTY_TAPE_STATS.MASTER_DATA_IN_BYTES, 0) AS COPY_NB1_IN_BYTES,"
-      "IF COPY_NB > 1 THEN COALESCE(NON_EMPTY_TAPE_STATS.NB_MASTER_FILES, 0) AS NB_COPY_NB_GT1,"
-      "IF COPY_NB > 1 THEN COALESCE(NON_EMPTY_TAPE_STATS.MASTER_DATA_IN_BYTES, 0) AS COPY_NB_GT1_IN_BYTES "
+      "COALESCE(NON_EMPTY_TAPE_STATS.NB_MASTER_FILES, 0) AS COMPUTED_NB_MASTER_FILES,"
+      "COALESCE(NON_EMPTY_TAPE_STATS.MASTER_DATA_IN_BYTES, 0) AS COMPUTED_MASTER_DATA_IN_BYTES,"
+      "CASE WHEN COPY_NB = 1 THEN COALESCE(NON_EMPTY_TAPE_STATS.NB_MASTER_FILES, 0) ELSE 0 END AS NB_COPY_NB_1,"
+      "CASE WHEN COPY_NB = 1 THEN COALESCE(NON_EMPTY_TAPE_STATS.MASTER_DATA_IN_BYTES, 0) ELSE 0 END AS COPY_NB_1_IN_BYTES,"
+      "CASE WHEN COPY_NB > 1 THEN COALESCE(NON_EMPTY_TAPE_STATS.NB_MASTER_FILES, 0) ELSE 0 END AS NB_COPY_NB_GT_1,"
+      "CASE WHEN COPY_NB > 1 THEN COALESCE(NON_EMPTY_TAPE_STATS.MASTER_DATA_IN_BYTES, 0) ELSE 0 END AS COPY_NB_GT_1_IN_BYTES "
     "FROM "
       "TAPE T "
     "LEFT OUTER JOIN "
@@ -70,7 +70,7 @@ void TapeStatisticsUpdater::updateTapeStatistics() {
       "WHERE "
         "TAPE_FILE.SUPERSEDED_BY_VID IS NULL AND "
         "TAPE_FILE.SUPERSEDED_BY_FSEQ IS NULL "
-      "GROUP BY TAPE_FILE.VID"
+      "GROUP BY TAPE_FILE.VID, ARCHIVE_ROUTE.COPY_NB"
     ") NON_EMPTY_TAPE_STATS ON "
       "T.VID = NON_EMPTY_TAPE_STATS.VID "
     "WHERE T.VID = TAPE_TO_UPDATE.VID"