Skip to content

Commit 130714e

Browse files
committed
[ntuple][NFC] Rename NTupleJoinValue_t to JoinValue_t
Since it is declared within `RNTupleJoinTable`, it is clear that this type belongs to RNTuple from the context.
1 parent 5d8f1d0 commit 130714e

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

tree/ntuple/v7/inc/ROOT/RNTupleJoinTable.hxx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace Internal {
3535
// clang-format on
3636
class RNTupleJoinTable {
3737
public:
38-
using NTupleJoinValue_t = std::uint64_t;
38+
using JoinValue_T = std::uint64_t;
3939
using PartitionKey_t = std::uint64_t;
4040
static constexpr PartitionKey_t kDefaultPartitionKey = PartitionKey_t(-1);
4141

@@ -52,12 +52,9 @@ private:
5252
//////////////////////////////////////////////////////////////////////////
5353
/// Container for the combined hashes of join field values.
5454
struct RCombinedJoinFieldValue {
55-
std::vector<NTupleJoinValue_t> fJoinFieldValues;
55+
std::vector<JoinValue_T> fJoinFieldValues;
5656

57-
RCombinedJoinFieldValue(const std::vector<NTupleJoinValue_t> &joinFieldValues)
58-
: fJoinFieldValues(joinFieldValues)
59-
{
60-
}
57+
RCombinedJoinFieldValue(const std::vector<JoinValue_T> &joinFieldValues) : fJoinFieldValues(joinFieldValues) {}
6158

6259
inline bool operator==(const RCombinedJoinFieldValue &other) const
6360
{

tree/ntuple/v7/src/RNTupleJoinTable.cxx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616
#include <ROOT/RNTupleJoinTable.hxx>
1717

1818
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)
2120
{
22-
ROOT::Experimental::Internal::RNTupleJoinTable::NTupleJoinValue_t value;
21+
ROOT::Experimental::Internal::RNTupleJoinTable::JoinValue_T value;
2322

2423
switch (fieldValueSize) {
2524
case 1: value = *reinterpret_cast<std::uint8_t *>(valuePtr); break;
@@ -69,7 +68,7 @@ void ROOT::Experimental::Internal::RNTupleJoinTable::REntryMapping::Build()
6968
fields.emplace_back(std::move(field));
7069
}
7170

72-
std::vector<NTupleJoinValue_t> castJoinValues;
71+
std::vector<JoinValue_T> castJoinValues;
7372
castJoinValues.reserve(fJoinFieldNames.size());
7473

7574
for (unsigned i = 0; i < fPageSource->GetNEntries(); ++i) {
@@ -94,7 +93,7 @@ ROOT ::Experimental::Internal::RNTupleJoinTable::REntryMapping::GetEntryIndexes(
9493
if (valuePtrs.size() != fJoinFieldNames.size())
9594
throw RException(R__FAIL("number of value pointers must match number of join fields"));
9695

97-
std::vector<NTupleJoinValue_t> castJoinValues;
96+
std::vector<JoinValue_T> castJoinValues;
9897
castJoinValues.reserve(valuePtrs.size());
9998

10099
for (unsigned i = 0; i < valuePtrs.size(); ++i) {

0 commit comments

Comments
 (0)