Skip to content

Use constexpr in CondDB query building #48279

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
cmsbuild merged 2 commits into from
Jun 16, 2025
Merged

Use constexpr in CondDB query building #48279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d13744
Make tableName constexpr in CondDB
Dr15Jones Jun 9, 2025
f0a01d9
make fullyQualifiedName consteval in CondDB
Dr15Jones Jun 9, 2025
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
139 changes: 123 additions & 16 deletions CondCore/CondDB/src/DbCore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,113 @@
#include <set>
#include <map>
#include <memory>
#include <string_view>

//
#include <boost/date_time/posix_time/posix_time.hpp>

// macros for the schema definition

namespace condcore_detail {
consteval int string_size(char const* iSize) { return std::string_view(iSize).size(); }

template <int N, int M>
consteval std::array<char, N + M + 2> makeFullName(const char* n, const char* m) {
if (std::string_view(n).size() != N) {
throw "makeFullName first argument incorrect size";
}
if (std::string_view(m).size() != M) {
throw "makeFullName second argument incorrect size";
}
std::array<char, N + M + 2> ret = {};
for (int i = 0; i < N; ++i) {
ret[i] = n[i];
}
ret[N] = '.';
for (int i = 0; i < M; ++i) {
ret[i + N + 1] = m[i];
}
return ret;
Copy link
Contributor

@perrotta perrotta Jun 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The location ret[N+M+1] remains empty: is t wanted?

Copy link
Contributor Author

@Dr15Jones Dr15Jones Jun 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The line std::array<char, N + M + 2> ret = {}; initializes all values to 0. In fact, the rules for consteval is no variable is allowed to have any values uninitialized and the compilers are required to enforce that.

Copy link
Contributor

@perrotta perrotta Jun 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @Dr15Jones . My question was rather: did you forget to fill with something different than 0 the last char? Or maybe the array was over-dimensioned with M+N+2 elements? Or maybe it is just wanted to stay as such...

Copy link
Contributor Author

@Dr15Jones Dr15Jones Jun 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the arrays should be the size of the copied strings + 1 where the last element is a null termination. The compile time unit tests check that. That keeps with the standard C string behavior (even though I could explicitly tell the std::string_view how many characters it should use).

}

consteval void test_makeFullName() {
constexpr auto v = makeFullName<2, 3>("ab", "cde");
static_assert(v.size() == 2 + 3 + 1 + 1);
static_assert('a' == v[0]);
static_assert('b' == v[1]);
static_assert('.' == v[2]);
static_assert('c' == v[3]);
static_assert('d' == v[4]);
static_assert('e' == v[5]);
static_assert(0 == v[6]);
}

template <int N>
consteval std::array<char, N + 5 + 1> addMin(std::string_view n) {
if (n.size() != N) {
throw "addMin argument wrong size";
}
std::array<char, N + 5 + 1> ret = {};
ret[0] = 'M';
ret[1] = 'I';
ret[2] = 'N';
ret[3] = '(';
for (int i = 0; i < N; ++i) {
ret[4 + i] = n[i];
}
ret[N + 4] = ')';
return ret;
}

consteval void test_addMin() {
constexpr std::string_view foo("Foo");
constexpr auto addMin_ = addMin<3>(foo);
static_assert(addMin_.size() == 9);
static_assert(addMin_[0] == 'M');
static_assert(addMin_[1] == 'I');
static_assert(addMin_[2] == 'N');
static_assert(addMin_[3] == '(');
static_assert(addMin_[4] == 'F');
static_assert(addMin_[5] == 'o');
static_assert(addMin_[6] == 'o');
static_assert(addMin_[7] == ')');
static_assert(addMin_[8] == 0);
}

template <int N>
consteval std::array<char, N + 5 + 1> addMax(std::string_view n) {
if (n.size() != N) {
throw "addMax argument wrong size";
}
std::array<char, N + 5 + 1> ret = {};
ret[0] = 'M';
ret[1] = 'A';
ret[2] = 'X';
ret[3] = '(';
for (int i = 0; i < N; ++i) {
ret[4 + i] = n[i];
}
ret[N + 4] = ')';
return ret;
}

consteval void test_addMax() {
constexpr std::string_view foo("Foo");
constexpr auto addMin_ = addMax<3>(foo);
static_assert(addMin_.size() == 9);
static_assert(addMin_[0] == 'M');
static_assert(addMin_[1] == 'A');
static_assert(addMin_[2] == 'X');
static_assert(addMin_[3] == '(');
static_assert(addMin_[4] == 'F');
static_assert(addMin_[5] == 'o');
static_assert(addMin_[6] == 'o');
static_assert(addMin_[7] == ')');
static_assert(addMin_[8] == 0);
}

} // namespace condcore_detail

// table definition
#define conddb_table(NAME) \
namespace NAME { \
Expand All @@ -54,13 +156,16 @@
// implementation for the column definition:

// case with 3 params
#define FIXSIZE_COLUMN(NAME, TYPE, SIZE) \
struct NAME { \
static constexpr char const* name = #NAME; \
typedef TYPE type; \
static constexpr size_t size = SIZE; \
static std::string tableName() { return std::string(tname); } \
static std::string fullyQualifiedName() { return std::string(tname) + "." + std::string(name); } \
#define FIXSIZE_COLUMN(NAME, TYPE, SIZE) \
struct NAME { \
static constexpr char const* name = #NAME; \
typedef TYPE type; \
static constexpr size_t size = SIZE; \
static constexpr std::string_view tableName() { return std::string_view(tname); } \
static constexpr auto fullyQualifiedName_ = \
condcore_detail::makeFullName<condcore_detail::string_size(tname), condcore_detail::string_size(name)>(tname, \
name); \
static constexpr std::string_view fullyQualifiedName() { return std::string_view(fullyQualifiedName_.data()); } \
};

// case with 2 params
Expand Down Expand Up @@ -155,7 +260,7 @@ namespace cond {
varId << Column::name << "_" << id;
if (!whereClause.empty())
whereClause += " AND ";
whereClause += Column::fullyQualifiedName() + " " + condition + " :" + varId.str() + " ";
whereClause += std::string(Column::fullyQualifiedName()) + " " + condition + " :" + varId.str() + " ";
//bool init = (id == 0);
f_add_attribute(data, varId.str(), value);
}
Expand Down Expand Up @@ -331,7 +436,8 @@ namespace cond {
template <typename Column, typename ReferencedColumn>
void setForeignKey(const std::string& name) {
checkColumns<0, Column>();
m_description.createForeignKey(name, Column::name, ReferencedColumn::tableName(), ReferencedColumn::name);
m_description.createForeignKey(
name, Column::name, std::string(ReferencedColumn::tableName()), ReferencedColumn::name);
}

const coral::TableDescription& get() { return m_description; }
Expand Down Expand Up @@ -388,7 +494,7 @@ namespace cond {
}
};
template <std::size_t n>
struct GetFromRow<std::array<char, n> > {
struct GetFromRow<std::array<char, n>> {
std::string operator()(const coral::AttributeList& row, const std::string& fullyQualifiedName) {
std::string val = row[fullyQualifiedName].data<std::string>();
if (val.size() != n)
Expand Down Expand Up @@ -426,7 +532,7 @@ namespace cond {

template <typename T>
typename T::type get() const {
return GetFromRow<typename T::type>()(*m_currentRow, T::fullyQualifiedName());
return GetFromRow<typename T::type>()(*m_currentRow, std::string(T::fullyQualifiedName()));
}

auto operator*() -> decltype(std::make_tuple(this->get<Types>()...)) { return std::make_tuple(get<Types>()...); }
Expand Down Expand Up @@ -492,7 +598,7 @@ namespace cond {
}
};
template <std::size_t n>
struct DefineQueryOutput<std::array<char, n> > {
struct DefineQueryOutput<std::array<char, n>> {
static void make(coral::IQuery& query, const std::string& fullyQualifiedName) {
query.addToOutputList(fullyQualifiedName);
query.defineOutputType(fullyQualifiedName, coral::AttributeSpecification::typeNameForType<std::string>());
Expand All @@ -514,8 +620,9 @@ namespace cond {
template <typename Col>
Query& addTable() {
if (m_tables.find(Col::tableName()) == m_tables.end()) {
m_coralQuery->addToTableList(Col::tableName());
m_tables.insert(Col::tableName());
std::string const tb{Col::tableName()};
m_coralQuery->addToTableList(std::string(tb));
m_tables.insert(std::move(tb));
}
return *this;
}
Expand All @@ -526,7 +633,7 @@ namespace cond {
template <int n, typename Arg1, typename... Args>
void _Query() {
addTable<Arg1>();
DefineQueryOutput<typename Arg1::type>::make(*m_coralQuery, Arg1::fullyQualifiedName());
DefineQueryOutput<typename Arg1::type>::make(*m_coralQuery, std::string(Arg1::fullyQualifiedName()));
_Query<n + 1, Args...>();
}

Expand Down Expand Up @@ -602,7 +709,7 @@ namespace cond {
size_t m_retrievedRows = 0;
coral::AttributeList m_whereData;
std::string m_whereClause;
std::set<std::string> m_tables;
std::set<std::string, std::less<>> m_tables;
};

class UpdateBuffer {
Expand Down
24 changes: 15 additions & 9 deletions CondCore/CondDB/src/IOVSchema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,37 +112,43 @@ namespace cond {
conddb_column(SINCE, cond::Time_t);
conddb_column(PAYLOAD_HASH, std::string, PAYLOAD::PAYLOAD_HASH_SIZE);
conddb_column(INSERTION_TIME, boost::posix_time::ptime);
static constexpr auto minSINCE_ =
condcore_detail::addMin<SINCE::fullyQualifiedName().size()>(SINCE::fullyQualifiedName());
static constexpr std::string_view minSINCE() { return std::string_view(minSINCE_.data()); }
static constexpr auto maxSINCE_ =
condcore_detail::addMax<SINCE::fullyQualifiedName().size()>(SINCE::fullyQualifiedName());
static constexpr std::string_view maxSINCE() { return std::string_view(maxSINCE_.data()); }

struct SINCE_GROUP {
typedef cond::Time_t type;
static constexpr size_t size = 0;
static std::string tableName() { return SINCE::tableName(); }
static std::string fullyQualifiedName() { return "MIN(" + SINCE::fullyQualifiedName() + ")"; }
static constexpr std::string_view tableName() { return SINCE::tableName(); }
static constexpr std::string_view fullyQualifiedName() { return minSINCE(); }
static std::string group(unsigned long long groupSize) {
std::string sgroupSize = std::to_string(groupSize);
return "CAST(" + SINCE::fullyQualifiedName() + "/" + sgroupSize + " AS INT )*" + sgroupSize;
return "CAST(" + std::string(SINCE::fullyQualifiedName()) + "/" + sgroupSize + " AS INT )*" + sgroupSize;
}
};

struct SEQUENCE_SIZE {
typedef unsigned int type;
static constexpr size_t size = 0;
static std::string tableName() { return SINCE::tableName(); }
static std::string fullyQualifiedName() { return "COUNT(*)"; }
static constexpr std::string_view tableName() { return SINCE::tableName(); }
static constexpr std::string_view fullyQualifiedName() { return "COUNT(*)"; }
};

struct MIN_SINCE {
typedef cond::Time_t type;
static constexpr size_t size = 0;
static std::string tableName() { return SINCE::tableName(); }
static std::string fullyQualifiedName() { return "MIN(" + SINCE::fullyQualifiedName() + ")"; }
static constexpr std::string_view tableName() { return SINCE::tableName(); }
static constexpr std::string_view fullyQualifiedName() { return minSINCE(); }
};

struct MAX_SINCE {
typedef cond::Time_t type;
static constexpr size_t size = 0;
static std::string tableName() { return SINCE::tableName(); }
static std::string fullyQualifiedName() { return "MAX(" + SINCE::fullyQualifiedName() + ")"; }
static constexpr std::string_view tableName() { return SINCE::tableName(); }
static constexpr std::string_view fullyQualifiedName() { return maxSINCE(); }
};

class Table : public IIOVTable {
Expand Down
18 changes: 12 additions & 6 deletions CondCore/CondDB/src/RunInfoSchema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,28 @@ namespace cond {
struct MAX_RUN_NUMBER {
typedef cond::Time_t type;
static constexpr size_t size = 0;
static std::string tableName() { return RUN_NUMBER::tableName(); }
static std::string fullyQualifiedName() { return "MAX(" + RUN_NUMBER::fullyQualifiedName() + ")"; }
static constexpr std::string_view tableName() { return RUN_NUMBER::tableName(); }
static constexpr auto fullyQualifiedName_ =
condcore_detail::addMax<RUN_NUMBER::fullyQualifiedName().size()>(RUN_NUMBER::fullyQualifiedName());
static constexpr std::string_view fullyQualifiedName() { return std::string_view(fullyQualifiedName_.data()); }
};

struct MIN_RUN_NUMBER {
typedef cond::Time_t type;
static constexpr size_t size = 0;
static std::string tableName() { return RUN_NUMBER::tableName(); }
static std::string fullyQualifiedName() { return "MIN(" + RUN_NUMBER::fullyQualifiedName() + ")"; }
static constexpr std::string_view tableName() { return RUN_NUMBER::tableName(); }
static constexpr auto fullyQualifiedName_ =
condcore_detail::addMin<RUN_NUMBER::fullyQualifiedName().size()>(RUN_NUMBER::fullyQualifiedName());
static constexpr std::string_view fullyQualifiedName() { return std::string_view(fullyQualifiedName_.data()); }
};

struct MIN_START_TIME {
typedef boost::posix_time::ptime type;
static constexpr size_t size = 0;
static std::string tableName() { return START_TIME::tableName(); }
static std::string fullyQualifiedName() { return "MIN(" + START_TIME::fullyQualifiedName() + ")"; }
static constexpr std::string_view tableName() { return START_TIME::tableName(); }
static constexpr auto fullyQualifiedName_ =
condcore_detail::addMin<START_TIME::fullyQualifiedName().size()>(START_TIME::fullyQualifiedName());
static constexpr std::string_view fullyQualifiedName() { return std::string_view(fullyQualifiedName_.data()); }
};

class Table : public IRunInfoTable {
Expand Down