@@ -69,20 +69,21 @@ ROOT::Experimental::Internal::RNTupleJoinTable::REntryMapping::REntryMapping(
69
69
fields.emplace_back (std::move (field));
70
70
}
71
71
72
- std::vector<NTupleJoinValue_t> joinFieldValues ;
73
- joinFieldValues .reserve (fJoinFieldNames .size ());
72
+ std::vector<NTupleJoinValue_t> castJoinValues ;
73
+ castJoinValues .reserve (fJoinFieldNames .size ());
74
74
75
75
for (unsigned i = 0 ; i < pageSource.GetNEntries (); ++i) {
76
- joinFieldValues.clear ();
76
+ castJoinValues.clear ();
77
+
77
78
for (auto &fieldValue : fieldValues) {
78
79
// TODO(fdegeus): use bulk reading
79
80
fieldValue.Read (i);
80
81
81
82
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 ()));
83
84
}
84
85
85
- fMapping [RCombinedJoinFieldValue (joinFieldValues )].push_back (i);
86
+ fMapping [RCombinedJoinFieldValue (castJoinValues )].push_back (i);
86
87
}
87
88
}
88
89
@@ -92,14 +93,14 @@ ROOT ::Experimental::Internal::RNTupleJoinTable::REntryMapping::GetEntryIndexes(
92
93
if (valuePtrs.size () != fJoinFieldNames .size ())
93
94
throw RException (R__FAIL (" number of value pointers must match number of join fields" ));
94
95
95
- std::vector<NTupleJoinValue_t> joinFieldValues ;
96
- joinFieldValues .reserve (valuePtrs.size ());
96
+ std::vector<NTupleJoinValue_t> castJoinValues ;
97
+ castJoinValues .reserve (valuePtrs.size ());
97
98
98
99
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]));
100
101
}
101
102
102
- if (const auto &entries = fMapping .find (RCombinedJoinFieldValue (joinFieldValues )); entries != fMapping .end ()) {
103
+ if (const auto &entries = fMapping .find (RCombinedJoinFieldValue (castJoinValues )); entries != fMapping .end ()) {
103
104
return &entries->second ;
104
105
}
105
106
0 commit comments