File tree 2 files changed +7
-11
lines changed
2 files changed +7
-11
lines changed Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ namespace Internal {
35
35
// clang-format on
36
36
class RNTupleJoinTable {
37
37
public:
38
- using NTupleJoinValue_t = std::uint64_t ;
38
+ using JoinValue_t = std::uint64_t ;
39
39
using PartitionKey_t = std::uint64_t ;
40
40
static constexpr PartitionKey_t kDefaultPartitionKey = PartitionKey_t(-1 );
41
41
@@ -52,12 +52,9 @@ private:
52
52
// ////////////////////////////////////////////////////////////////////////
53
53
// / Container for the combined hashes of join field values.
54
54
struct RCombinedJoinFieldValue {
55
- std::vector<NTupleJoinValue_t > fJoinFieldValues ;
55
+ std::vector<JoinValue_t > fJoinFieldValues ;
56
56
57
- RCombinedJoinFieldValue (const std::vector<NTupleJoinValue_t> &joinFieldValues)
58
- : fJoinFieldValues (joinFieldValues)
59
- {
60
- }
57
+ RCombinedJoinFieldValue (const std::vector<JoinValue_t> &joinFieldValues) : fJoinFieldValues (joinFieldValues) {}
61
58
62
59
inline bool operator ==(const RCombinedJoinFieldValue &other) const
63
60
{
Original file line number Diff line number Diff line change 16
16
#include < ROOT/RNTupleJoinTable.hxx>
17
17
18
18
namespace {
19
- ROOT::Experimental::Internal::RNTupleJoinTable::NTupleJoinValue_t
20
- CastValuePtr (void *valuePtr, std::size_t fieldValueSize)
19
+ ROOT::Experimental::Internal::RNTupleJoinTable::JoinValue_t CastValuePtr (void *valuePtr, std::size_t fieldValueSize)
21
20
{
22
- ROOT::Experimental::Internal::RNTupleJoinTable::NTupleJoinValue_t value;
21
+ ROOT::Experimental::Internal::RNTupleJoinTable::JoinValue_t value;
23
22
24
23
switch (fieldValueSize) {
25
24
case 1 : value = *reinterpret_cast <std::uint8_t *>(valuePtr); break ;
@@ -69,7 +68,7 @@ ROOT::Experimental::Internal::RNTupleJoinTable::REntryMapping::REntryMapping(
69
68
fields.emplace_back (std::move (field));
70
69
}
71
70
72
- std::vector<NTupleJoinValue_t > castJoinValues;
71
+ std::vector<JoinValue_t > castJoinValues;
73
72
castJoinValues.reserve (fJoinFieldNames .size ());
74
73
75
74
for (unsigned i = 0 ; i < pageSource.GetNEntries (); ++i) {
@@ -93,7 +92,7 @@ ROOT ::Experimental::Internal::RNTupleJoinTable::REntryMapping::GetEntryIndexes(
93
92
if (valuePtrs.size () != fJoinFieldNames .size ())
94
93
throw RException (R__FAIL (" number of value pointers must match number of join fields" ));
95
94
96
- std::vector<NTupleJoinValue_t > castJoinValues;
95
+ std::vector<JoinValue_t > castJoinValues;
97
96
castJoinValues.reserve (valuePtrs.size ());
98
97
99
98
for (unsigned i = 0 ; i < valuePtrs.size (); ++i) {
You can’t perform that action at this time.
0 commit comments