Skip to content

DPL: do not use an attribute value the query parser failed to read #16101

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 1 commit into from
Nov 12, 2026
+19 −32
Merged

DPL: do not use an attribute value the query parser failed to read #16101

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
51 changes: 19 additions & 32 deletions Framework/Core/src/DataDescriptorQueryBuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ std::vector<InputSpec> DataDescriptorQueryBuilder::parse(char const* config)
currentDescription.reset();
currentSubSpec.reset();
currentTimeModulo.reset();
currentKey.reset();
currentValue.reset();
pushState(IN_BEGIN_BINDING);
} break;
case IN_BEGIN_BINDING: {
Expand Down Expand Up @@ -322,41 +324,26 @@ std::vector<InputSpec> DataDescriptorQueryBuilder::parse(char const* config)
token(IN_STRING, "&;");
} break;
case IN_END_VALUE: {
QueryBuilderState nextState;
if (*next == '&') {
assignLastStringMatch("value", 1000, currentValue, IN_BEGIN_KEY);
if (*currentKey == "lifetime" && currentValue == "condition") {
currentLifetime = Lifetime::Condition;
}
if (*currentKey == "ccdb-run-dependent") {
int val = currentValue == "false" ? 0 : (currentValue == "true" ? 1 : std::stoi(*currentValue));
attributes.push_back(ConfigParamSpec{*currentKey, VariantType::Int, val, {}});
} else {
attributes.push_back(ConfigParamSpec{*currentKey, VariantType::String, *currentValue, {}});
}
} else if (*next == ';') {
assignLastStringMatch("value", 1000, currentValue, IN_END_ATTRIBUTES);
if (*currentKey == "lifetime" && currentValue == "condition") {
currentLifetime = Lifetime::Condition;
}
if (*currentKey == "ccdb-run-dependent") {
int val = currentValue == "false" ? 0 : (currentValue == "true" ? 1 : std::stoi(*currentValue));
attributes.push_back(ConfigParamSpec{*currentKey, VariantType::Int, val, {}});
} else {
attributes.push_back(ConfigParamSpec{*currentKey, VariantType::String, *currentValue, {}});
}
} else if (*next == '\0') {
assignLastStringMatch("value", 1000, currentValue, IN_END_ATTRIBUTES);
if (*currentKey == "lifetime" && currentValue == "condition") {
currentLifetime = Lifetime::Condition;
}
if (*currentKey == "ccdb-run-dependent") {
int val = currentValue == "false" ? 0 : (currentValue == "true" ? 1 : std::stoi(*currentValue));
attributes.push_back(ConfigParamSpec{*currentKey, VariantType::Int, val, {}});
} else {
attributes.push_back(ConfigParamSpec{*currentKey, VariantType::String, *currentValue, {}});
}
nextState = IN_BEGIN_KEY;
} else if (*next == ';' || *next == '\0') {
nextState = IN_END_ATTRIBUTES;
} else {
error("missing value for string value");
continue;
}
if (!assignLastStringMatch("value", 1000, currentValue, nextState)) {
continue; // The error is pushed and currentValue is not set.
}
if (*currentKey == "lifetime" && currentValue == "condition") {
currentLifetime = Lifetime::Condition;
}
if (*currentKey == "ccdb-run-dependent") {
int val = currentValue == "false" ? 0 : (currentValue == "true" ? 1 : std::stoi(*currentValue));
attributes.push_back(ConfigParamSpec{*currentKey, VariantType::Int, val, {}});
} else {
attributes.push_back(ConfigParamSpec{*currentKey, VariantType::String, *currentValue, {}});
}
} break;
case IN_END_ATTRIBUTES: {
Expand Down
Loading