Skip to content

Commit 938aff3

Browse files
committed
[ntuple][NFC] Rename joinFieldValues to castJoinValues
1 parent 2b9284d commit 938aff3

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

tree/ntuple/v7/src/RNTupleJoinTable.cxx

+10-9
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,21 @@ ROOT::Experimental::Internal::RNTupleJoinTable::REntryMapping::REntryMapping(
6969
fields.emplace_back(std::move(field));
7070
}
7171

72-
std::vector<NTupleJoinValue_t> joinFieldValues;
73-
joinFieldValues.reserve(fJoinFieldNames.size());
72+
std::vector<NTupleJoinValue_t> castJoinValues;
73+
castJoinValues.reserve(fJoinFieldNames.size());
7474

7575
for (unsigned i = 0; i < pageSource.GetNEntries(); ++i) {
76-
joinFieldValues.clear();
76+
castJoinValues.clear();
77+
7778
for (auto &fieldValue : fieldValues) {
7879
// TODO(fdegeus): use bulk reading
7980
fieldValue.Read(i);
8081

8182
auto valuePtr = fieldValue.GetPtr<void>();
82-
joinFieldValues.push_back(CastValuePtr(valuePtr.get(), fieldValue.GetField().GetValueSize()));
83+
castJoinValues.push_back(CastValuePtr(valuePtr.get(), fieldValue.GetField().GetValueSize()));
8384
}
8485

85-
fMapping[RCombinedJoinFieldValue(joinFieldValues)].push_back(i);
86+
fMapping[RCombinedJoinFieldValue(castJoinValues)].push_back(i);
8687
}
8788
}
8889

@@ -92,14 +93,14 @@ ROOT ::Experimental::Internal::RNTupleJoinTable::REntryMapping::GetEntryIndexes(
9293
if (valuePtrs.size() != fJoinFieldNames.size())
9394
throw RException(R__FAIL("number of value pointers must match number of join fields"));
9495

95-
std::vector<NTupleJoinValue_t> joinFieldValues;
96-
joinFieldValues.reserve(valuePtrs.size());
96+
std::vector<NTupleJoinValue_t> castJoinValues;
97+
castJoinValues.reserve(valuePtrs.size());
9798

9899
for (unsigned i = 0; i < valuePtrs.size(); ++i) {
99-
joinFieldValues.push_back(CastValuePtr(valuePtrs[i], fJoinFieldValueSizes[i]));
100+
castJoinValues.push_back(CastValuePtr(valuePtrs[i], fJoinFieldValueSizes[i]));
100101
}
101102

102-
if (const auto &entries = fMapping.find(RCombinedJoinFieldValue(joinFieldValues)); entries != fMapping.end()) {
103+
if (const auto &entries = fMapping.find(RCombinedJoinFieldValue(castJoinValues)); entries != fMapping.end()) {
103104
return &entries->second;
104105
}
105106

0 commit comments

Comments
 (0)