Skip to content

[ntuple] Change internal name of join field #23359

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

Open
enirolf wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −8
Open

[ntuple] Change internal name of join field #23359

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
13 changes: 5 additions & 8 deletions tree/ntuple/src/RNTupleProcessor.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,9 @@ ROOT::Experimental::RNTupleSingleProcessor::CreateAndConnectField(const std::str
{
assert(fPageSource);

std::string onDiskFieldName = qualifiedFieldName;

// Strip the "_join" prefix (for join fields) from the field name, if present.
if (onDiskFieldName.find("_join.") == 0) {
onDiskFieldName = onDiskFieldName.substr(6);
}
// Strip the "R_rntproc_join_" prefix (for join fields) from the field name, if present.
const std::string onDiskFieldName =
qualifiedFieldName.find("R_rntproc_join_") == 0 ? qualifiedFieldName.substr(15) : qualifiedFieldName;

const auto &desc = fPageSource->GetSharedDescriptorGuard().GetRef();
ROOT::RFieldZero fieldZero;
Expand Down Expand Up @@ -450,8 +447,8 @@ void ROOT::Experimental::RNTupleJoinProcessor::Initialize(

// We prepend the name of the primary processor in this case to prevent reading from the wrong join field in
// composed join operations.
auto fieldIdx = AddFieldToEntry(fOptions.GetProcessorName() + "._join." + joinField, "std::uint64_t", nullptr,
Internal::RNTupleProcessorProvenance(fOptions.GetProcessorName()));
auto fieldIdx = AddFieldToEntry(fOptions.GetProcessorName() + ".R_rntproc_join_" + joinField, "std::uint64_t",
nullptr, Internal::RNTupleProcessorProvenance(fOptions.GetProcessorName()));
fJoinFieldIdxs.insert(fieldIdx);
}

Expand Down
Loading