Skip to content

[6.40] [df] Consider quoted strings in collection size short syntax - #23826

Merged
dpiparo merged 2 commits into
root-project:v6-40-00-patchesfrom
root-project-bot:BP_6.40_pull_23804
Oct 24, 2026
Merged

dpiparo merged 2 commits into
root-project:v6-40-00-patchesfrom
root-project-bot:BP_6.40_pull_23804

Conversation

@root-project-bot

Copy link
Copy Markdown

Backport of #23804, requested by @vepadulano.

vepadulano and others added 2 commits October 24, 2026 09:39
The regex pattern present before was not refined enough to consider the
case where the target #varname could happen to be within a quoted
string. Improve the regex pattern in ParseRDFExpression and add a more
complicated test case in dataframe_interface.cxx

Fixes root-project#23790

(cherry picked from commit cb1b496)
Also add a test where the user defines a column of type std::string with
a value that could be ambiguous w.r.t. the short syntax for collection
sizes. RDataFrame should not substitute the string value in this case,
it should be returned as-is to downstream actions.

Co-authored-by: muntasir-396 <muntasirmamun396@gmail.com>
(cherry picked from commit c4011b2)
@github-actions

github-actions Bot commented Oct 24, 2026 •

Copy link
Copy Markdown

Test Results

    23 files      23 suites   3d 16h 46m 48s ⏱️
 3 874 tests  3 874 ✅ 0 💤 0 ❌
81 099 runs  81 099 ✅ 0 💤 0 ❌

Results for commit 98a20ff.

♻️ This comment has been updated with latest results.

@vepadulano vepadulano closed this Oct 24, 2026
@vepadulano vepadulano reopened this Oct 24, 2026
@dpiparo
dpiparo merged commit aef5c81 into root-project:v6-40-00-patches Oct 24, 2026
73 of 75 checks passed
@dpiparo
dpiparo deleted the BP_6.40_pull_23804 branch October 24, 2026 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants