Skip to content

DPL Analysis: add string expression parsing #14454

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
ktf merged 4 commits into from
Aug 8, 2025
Merged

DPL Analysis: add string expression parsing #14454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
883af37
DPL Analysis: fix hash calculation for the string_views
aalkin Jun 30, 2025
7e72523
DPL Analysis: add parsing of expressions from strings
aalkin Jun 30, 2025
01afe18
move unnecessary statics to .cxx
aalkin Jun 30, 2025
84e5eae
Allow filters to be set in init(); Add ability to set a filter from s…
aalkin Jun 30, 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
385 changes: 192 additions & 193 deletions Framework/Core/include/Framework/ASoA.h
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions Framework/Core/include/Framework/AnalysisTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,11 @@ DataProcessorSpec adaptAnalysisTask(ConfigContext const& ctx, Args&&... args)

callbacks.set<CallbackService::Id::EndOfStream>(eoscb);

/// call the task's init() function first as it may manipulate the task's elements
if constexpr (requires { task->init(ic); }) {
task->init(ic);
}

/// update configurables in filters and partitions
homogeneous_apply_refs(
[&ic](auto& element) -> bool { return analysis_task_parsers::updatePlaceholders(ic, element); },
Expand All @@ -584,10 +589,6 @@ DataProcessorSpec adaptAnalysisTask(ConfigContext const& ctx, Args&&... args)
},
*task.get());

if constexpr (requires { task->init(ic); }) {
task->init(ic);
}

/// parse process functions to enable requested grouping caches - note that at this state process configurables have their final values
if constexpr (requires { &T::process; }) {
AnalysisDataProcessorBuilder::cacheFromArgs(&T::process, true, bindingsKeys, bindingsKeysUnsorted);
Expand Down
19 changes: 14 additions & 5 deletions Framework/Core/include/Framework/ExpressionHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,26 @@ struct DatumSpec {
size_t hash = 0;
atype::type type = atype::NA;

explicit DatumSpec(size_t index, atype::type type_) : datum{index}, type{type_} {}
explicit DatumSpec(LiteralNode::var_t literal, atype::type type_) : datum{literal}, type{type_} {}
explicit DatumSpec(std::string binding, size_t hash_, atype::type type_) : datum{binding}, hash{hash_}, type{type_} {}
explicit constexpr DatumSpec(size_t index, atype::type type_) : datum{index}, type{type_} {}
explicit constexpr DatumSpec(LiteralNode::var_t literal, atype::type type_) : datum{literal}, type{type_} {}
explicit constexpr DatumSpec(std::string binding, size_t hash_, atype::type type_) : datum{binding}, hash{hash_}, type{type_} {}
DatumSpec() = default;
DatumSpec(DatumSpec const&) = default;
DatumSpec(DatumSpec&&) = default;
DatumSpec& operator=(DatumSpec const&) = default;
DatumSpec& operator=(DatumSpec&&) = default;
};

bool operator==(DatumSpec const& lhs, DatumSpec const& rhs);
bool operator==(DatumSpec const& rhs) const
{
bool eqValue = this->datum == rhs.datum;
bool eqHash = true;
if (this->datum.index() == 3 && eqValue) {
eqHash = this->hash == rhs.hash;
}
bool eqType = this->type == rhs.type;
return eqValue && eqHash && eqType;
}
};

std::ostream& operator<<(std::ostream& os, DatumSpec const& spec);

Expand Down
343 changes: 232 additions & 111 deletions Framework/Core/include/Framework/Expressions.h
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions Framework/Core/include/Framework/StringHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@ consteval uint32_t crc32(Ts... Vs)
return crc;
}

template <typename... Ts>
requires(std::same_as<Ts, std::string_view> && ...)
consteval uint32_t compile_time_hash(Ts... Vs)
{
return crc32(Vs...) ^ 0xFFFFFFFF;
}

consteval uint32_t compile_time_hash(char const* str)
{
return crc32(str, static_cast<int>(__builtin_strlen(str)) - 1) ^ 0xFFFFFFFF;
Expand Down
Loading