Skip to content

Please consider the following formatting changes to #8013 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Barthelemy merged 1 commit into from
Jan 27, 2022
Merged

Please consider the following formatting changes to #8013 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions CCDB/include/CCDB/CcdbApi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class CcdbApi //: public DatabaseInterface
* -2 : curl initialization error
*/
int storeAsTFile(const TObject* rootObject, std::string const& path, std::map<std::string, std::string> const& metadata,
long startValidityTimestamp = -1, long endValidityTimestamp = -1, std::vector<char>::size_type maxSize = 0 /*bytes*/) const;
long startValidityTimestamp = -1, long endValidityTimestamp = -1, std::vector<char>::size_type maxSize = 0 /*bytes*/) const;

/**
* Store into the CCDB a TFile containing an object of type T (which needs to have a ROOT dictionary)
Expand All @@ -138,14 +138,14 @@ class CcdbApi //: public DatabaseInterface
*/
template <typename T>
int storeAsTFileAny(const T* obj, std::string const& path, std::map<std::string, std::string> const& metadata,
long startValidityTimestamp = -1, long endValidityTimestamp = -1, std::vector<char>::size_type maxSize = 0 /*bytes*/) const
long startValidityTimestamp = -1, long endValidityTimestamp = -1, std::vector<char>::size_type maxSize = 0 /*bytes*/) const
{
return storeAsTFile_impl(reinterpret_cast<const void*>(obj), typeid(T), path, metadata, startValidityTimestamp, endValidityTimestamp, maxSize);
}

// interface for storing TObject via storeAsTFileAny
int storeAsTFileAny(const TObject* rootobj, std::string const& path, std::map<std::string, std::string> const& metadata,
long startValidityTimestamp = -1, long endValidityTimestamp = -1, std::vector<char>::size_type maxSize = 0 /*bytes*/) const
long startValidityTimestamp = -1, long endValidityTimestamp = -1, std::vector<char>::size_type maxSize = 0 /*bytes*/) const
{
return storeAsTFile(rootobj, path, metadata, startValidityTimestamp, endValidityTimestamp, maxSize);
}
Expand Down Expand Up @@ -406,8 +406,8 @@ class CcdbApi //: public DatabaseInterface
* -2 : curl initialization error
*/
int storeAsBinaryFile(const char* buffer, size_t size, const std::string& fileName, const std::string& objectType,
const std::string& path, const std::map<std::string, std::string>& metadata,
long startValidityTimestamp, long endValidityTimestamp, std::vector<char>::size_type maxSize = 0 /*in bytes*/) const;
const std::string& path, const std::map<std::string, std::string>& metadata,
long startValidityTimestamp, long endValidityTimestamp, std::vector<char>::size_type maxSize = 0 /*in bytes*/) const;

/**
* A generic helper implementation to store an obj whose type is given by a std::type_info
Expand All @@ -417,7 +417,7 @@ class CcdbApi //: public DatabaseInterface
* -2 : curl initialization error
*/
int storeAsTFile_impl(const void* obj1, std::type_info const& info, std::string const& path, std::map<std::string, std::string> const& metadata,
long startValidityTimestamp = -1, long endValidityTimestamp = -1, std::vector<char>::size_type maxSize = 0 /*in bytes*/) const;
long startValidityTimestamp = -1, long endValidityTimestamp = -1, std::vector<char>::size_type maxSize = 0 /*in bytes*/) const;

/**
* A generic helper implementation to query obj whose type is given by a std::type_info
Expand Down
16 changes: 8 additions & 8 deletions CCDB/src/CcdbApi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,22 +129,22 @@ std::unique_ptr<std::vector<char>> CcdbApi::createObjectImage(const TObject* roo
}

int CcdbApi::storeAsTFile_impl(const void* obj, std::type_info const& tinfo, std::string const& path,
std::map<std::string, std::string> const& metadata,
long startValidityTimestamp, long endValidityTimestamp,
std::vector<char>::size_type maxSize) const
std::map<std::string, std::string> const& metadata,
long startValidityTimestamp, long endValidityTimestamp,
std::vector<char>::size_type maxSize) const
{
// We need the TClass for this type; will verify if dictionary exists
CcdbObjectInfo info;
auto img = createObjectImage(obj, tinfo, &info);
return storeAsBinaryFile(img->data(), img->size(), info.getFileName(), info.getObjectType(),
path, metadata, startValidityTimestamp, endValidityTimestamp, maxSize);
path, metadata, startValidityTimestamp, endValidityTimestamp, maxSize);
}

int CcdbApi::storeAsBinaryFile(const char* buffer, size_t size, const std::string& filename, const std::string& objectType,
const std::string& path, const std::map<std::string, std::string>& metadata,
long startValidityTimestamp, long endValidityTimestamp, std::vector<char>::size_type maxSize) const
const std::string& path, const std::map<std::string, std::string>& metadata,
long startValidityTimestamp, long endValidityTimestamp, std::vector<char>::size_type maxSize) const
{
if(maxSize > 0 && size > maxSize) {
if (maxSize > 0 && size > maxSize) {
return -1;
}

Expand Down Expand Up @@ -219,7 +219,7 @@ int CcdbApi::storeAsBinaryFile(const char* buffer, size_t size, const std::strin
}

int CcdbApi::storeAsTFile(const TObject* rootObject, std::string const& path, std::map<std::string, std::string> const& metadata,
long startValidityTimestamp, long endValidityTimestamp, std::vector<char>::size_type maxSize) const
long startValidityTimestamp, long endValidityTimestamp, std::vector<char>::size_type maxSize) const
{
// Prepare file
CcdbObjectInfo info;
Expand Down