From eaa62f9295b81ddde1ac93ddb416ae987f5f4c43 Mon Sep 17 00:00:00 2001
From: Cedric Caffy <cedric.caffy@cern.ch>
Date: Tue, 15 Dec 2020 14:01:36 +0100
Subject: [PATCH] [cta-statistics] Adapted the statistics to get rid of the
superseded columns
---
statistics/DatabaseStatisticsService.cpp | 2 +-
statistics/StatisticsUpdateCmd.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/statistics/DatabaseStatisticsService.cpp b/statistics/DatabaseStatisticsService.cpp
index 4a701d8ba9..888e4fb7f2 100644
--- a/statistics/DatabaseStatisticsService.cpp
+++ b/statistics/DatabaseStatisticsService.cpp
@@ -77,7 +77,7 @@ void DatabaseStatisticsService::updateStatisticsPerTape(){
"ON "
"TAPE_FILE.ARCHIVE_FILE_ID = ARCHIVE_FILE.ARCHIVE_FILE_ID "
"WHERE "
- "TAPE_FILE.SUPERSEDED_BY_VID IS NULL AND TAPE_FILE.SUPERSEDED_BY_FSEQ IS NULL AND TAPE_FILE.VID = TAPE_TO_UPDATE.VID "
+ "TAPE_FILE.VID = TAPE_TO_UPDATE.VID "
"GROUP BY TAPE_FILE.VID, TAPE_FILE.COPY_NB"
") STATS "
"GROUP BY STATS.VID, STATS.COPY_NB, STATS.NB_FILES, STATS.DATA_IN_BYTES"
diff --git a/statistics/StatisticsUpdateCmd.cpp b/statistics/StatisticsUpdateCmd.cpp
index dd5bd9e090..22f9ce9fe7 100644
--- a/statistics/StatisticsUpdateCmd.cpp
+++ b/statistics/StatisticsUpdateCmd.cpp
@@ -75,7 +75,7 @@ int StatisticsUpdateCmd::exceptionThrowingMain(const int argc, char *const *cons
"NB_COPY_NB_GT_1",
"COPY_NB_GT_1_IN_BYTES"
});
- result += catalogueChecker->checkTableContainsColumns("TAPE_FILE",{"VID","ARCHIVE_FILE_ID","FSEQ","COPY_NB","SUPERSEDED_BY_VID","SUPERSEDED_BY_FSEQ"});
+ result += catalogueChecker->checkTableContainsColumns("TAPE_FILE",{"VID","ARCHIVE_FILE_ID","FSEQ","COPY_NB"});
result += catalogueChecker->checkTableContainsColumns("ARCHIVE_FILE",{"ARCHIVE_FILE_ID","SIZE_IN_BYTES"});
if(result.getStatus() == SchemaCheckerResult::FAILED){
--
GitLab