Skip to content

Commit 22afaf4

Browse files
authored
Add timestamp parameter to retrieve*JSON methods (#317)
1 parent 28c6ad7 commit 22afaf4

7 files changed

Lines changed: 14 additions & 14 deletions

File tree

Framework/include/QualityControl/CcdbDatabase.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ class CcdbDatabase : public DatabaseInterface
5858
// MonitorObject
5959
void storeMO(std::shared_ptr<o2::quality_control::core::MonitorObject> q) override;
6060
std::shared_ptr<o2::quality_control::core::MonitorObject> retrieveMO(std::string taskName, std::string objectName, long timestamp = 0) override;
61-
std::string retrieveMOJson(std::string taskName, std::string objectName) override;
61+
std::string retrieveMOJson(std::string taskName, std::string objectName, long timestamp = 0) override;
6262
// QualityObject
6363
void storeQO(std::shared_ptr<o2::quality_control::core::QualityObject> q) override;
6464
std::shared_ptr<o2::quality_control::core::QualityObject> retrieveQO(std::string checkerName, long timestamp = 0) override;
65-
std::string retrieveQOJson(std::string checkName) override;
65+
std::string retrieveQOJson(std::string checkName, long timestamp = 0) override;
6666

6767
void disconnect() override;
6868
void prepareTaskDataContainer(std::string taskName) override;

Framework/include/QualityControl/DatabaseInterface.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ class DatabaseInterface
8080
/**
8181
* Returns JSON encoded object
8282
*/
83-
virtual std::string retrieveMOJson(std::string taskName, std::string objectName) = 0;
84-
virtual std::string retrieveQOJson(std::string checkName) = 0;
83+
virtual std::string retrieveMOJson(std::string taskName, std::string objectName, long timestamp = 0) = 0;
84+
virtual std::string retrieveQOJson(std::string checkName, long timestamp = 0) = 0;
8585
virtual void disconnect() = 0;
8686
/**
8787
* \brief Prepare the container, such as a table in a relational database, that will contain the MonitorObject's for

Framework/include/QualityControl/DummyDatabase.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ class DummyDatabase : public DatabaseInterface
3333
// MonitorObject
3434
void storeMO(std::shared_ptr<o2::quality_control::core::MonitorObject> q) override;
3535
std::shared_ptr<o2::quality_control::core::MonitorObject> retrieveMO(std::string taskName, std::string objectName, long timestamp = 0) override;
36-
std::string retrieveMOJson(std::string taskName, std::string objectName) override;
36+
std::string retrieveMOJson(std::string taskName, std::string objectName, long timestamp = 0) override;
3737
// QualityObject
3838
void storeQO(std::shared_ptr<o2::quality_control::core::QualityObject> q) override;
3939
std::shared_ptr<o2::quality_control::core::QualityObject> retrieveQO(std::string checkerName, long timestamp = 0) override;
40-
std::string retrieveQOJson(std::string checkName) override;
40+
std::string retrieveQOJson(std::string checkName, long timestamp = 0) override;
4141

4242
void disconnect() override;
4343
void prepareTaskDataContainer(std::string taskName) override;

Framework/include/QualityControl/MySqlDatabase.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ class MySqlDatabase : public DatabaseInterface
4242
// MonitorObject
4343
void storeMO(std::shared_ptr<o2::quality_control::core::MonitorObject> q) override;
4444
std::shared_ptr<o2::quality_control::core::MonitorObject> retrieveMO(std::string taskName, std::string objectName, long timestamp = 0) override;
45-
std::string retrieveMOJson(std::string taskName, std::string objectName) override;
45+
std::string retrieveMOJson(std::string taskName, std::string objectName, long timestamp = 0) override;
4646
// QualityObject
4747
void storeQO(std::shared_ptr<o2::quality_control::core::QualityObject> q) override;
4848
std::shared_ptr<o2::quality_control::core::QualityObject> retrieveQO(std::string checkerName, long timestamp = 0) override;
49-
std::string retrieveQOJson(std::string checkName) override;
49+
std::string retrieveQOJson(std::string checkName, long timestamp = 0) override;
5050

5151
void disconnect() override;
5252
std::vector<std::string> getPublishedObjectNames(std::string taskName) override;

Framework/src/CcdbDatabase.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ std::shared_ptr<core::MonitorObject> CcdbDatabase::retrieveMO(std::string taskNa
147147
return mo;
148148
}
149149

150-
std::string CcdbDatabase::retrieveMOJson(std::string taskName, std::string objectName)
150+
std::string CcdbDatabase::retrieveMOJson(std::string taskName, std::string objectName, long /*timestamp*/)
151151
{
152152
auto monitor = retrieveMO(taskName, objectName);
153153
if (monitor == nullptr) {
@@ -199,7 +199,7 @@ std::shared_ptr<QualityObject> CcdbDatabase::retrieveQO(std::string checkerName,
199199
return qo;
200200
}
201201

202-
std::string CcdbDatabase::retrieveQOJson(std::string checkName)
202+
std::string CcdbDatabase::retrieveQOJson(std::string checkName, long /*timestamp*/)
203203
{
204204
auto qualityObject = retrieveQO(checkName);
205205
if (qualityObject == nullptr) {

Framework/src/DummyDatabase.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ std::shared_ptr<MonitorObject> DummyDatabase::retrieveMO(std::string, std::strin
3636
return std::shared_ptr<MonitorObject>();
3737
}
3838

39-
std::string DummyDatabase::retrieveMOJson(std::string, std::string)
39+
std::string DummyDatabase::retrieveMOJson(std::string, std::string, long)
4040
{
4141
return std::string();
4242
}
@@ -50,7 +50,7 @@ std::shared_ptr<QualityObject> DummyDatabase::retrieveQO(std::string, long)
5050
return std::shared_ptr<QualityObject>();
5151
}
5252

53-
std::string DummyDatabase::retrieveQOJson(std::string)
53+
std::string DummyDatabase::retrieveQOJson(std::string, long)
5454
{
5555
return std::string();
5656
}

Framework/src/MySqlDatabase.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ std::shared_ptr<o2::quality_control::core::QualityObject> MySqlDatabase::retriev
290290
return qo;
291291
}
292292

293-
std::string MySqlDatabase::retrieveQOJson(std::string checkName)
293+
std::string MySqlDatabase::retrieveQOJson(std::string checkName, long /*timestamp*/)
294294
{
295295
auto qualityObject = retrieveQO(checkName);
296296
if (qualityObject == nullptr) {
@@ -355,7 +355,7 @@ std::shared_ptr<o2::quality_control::core::MonitorObject> MySqlDatabase::retriev
355355
return mo;
356356
}
357357

358-
std::string MySqlDatabase::retrieveMOJson(std::string taskName, std::string objectName)
358+
std::string MySqlDatabase::retrieveMOJson(std::string taskName, std::string objectName, long /*timestamp*/)
359359
{
360360
auto monitor = retrieveMO(taskName, objectName);
361361
if (monitor == nullptr) {

0 commit comments

Comments
 (0)