Skip to content

Commit e14dd4a

Browse files
committed
[NFC][ntuple] clang-format RPageStorage[File].[hxx|cxx]
1 parent 0445eab commit e14dd4a

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

tree/ntuple/inc/ROOT/RPageStorage.hxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -634,21 +634,21 @@ private:
634634
/// Keeps track of the requested physical column IDs and their in-memory target type via a column element identifier.
635635
/// When using alias columns (projected fields), physical columns may be requested multiple times.
636636
class RActivePhysicalColumns {
637-
public:
637+
public:
638638
struct RColumnInfo {
639639
ROOT::Internal::RColumnElementBase::RIdentifier fElementId;
640640
std::size_t fRefCounter = 0;
641641
};
642642

643-
private:
643+
private:
644644
/// Maps physical column IDs to all the requested in-memory representations.
645645
/// A pair of physical column ID and in-memory representation can be requested multiple times, which is
646646
/// indicated by the reference counter.
647647
/// We can only have a handful of possible in-memory representations for a given column,
648648
/// so it is fine to search them linearly.
649649
std::unordered_map<ROOT::DescriptorId_t, std::vector<RColumnInfo>> fColumnInfos;
650650

651-
public:
651+
public:
652652
void Insert(ROOT::DescriptorId_t physicalColumnId, ROOT::Internal::RColumnElementBase::RIdentifier elementId);
653653
void Erase(ROOT::DescriptorId_t physicalColumnId, ROOT::Internal::RColumnElementBase::RIdentifier elementId);
654654
ROOT::Internal::RCluster::ColumnSet_t ToColumnSet() const;

tree/ntuple/src/RPageStorage.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ ROOT::Internal::RPageSource::LoadPageFromSummary(ColumnHandle_t columnHandle, co
470470
fCounters->fSzReadPayload.Add(sealedPage.GetBufferSize());
471471
} else {
472472
if (!fCurrentCluster || (fCurrentCluster->GetId() != clusterId) || !fCurrentCluster->ContainsColumn(columnId))
473-
fCurrentCluster = fClusterPool.GetCluster(clusterId, fActivePhysicalColumns.ToColumnSet());
473+
fCurrentCluster = fClusterPool.GetCluster(clusterId, fActivePhysicalColumns.ToColumnSet());
474474
R__ASSERT(fCurrentCluster->ContainsColumn(columnId));
475475

476476
// The cluster pool may have unzipped the required page into the page pool

tree/ntuple/src/RPageStorageFile.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,8 +525,8 @@ void ROOT::Internal::RPageSourceFile::LoadSealedPageImpl(const RNTupleLocator &l
525525
// Track seek distance (excluding file structure reads)
526526
if (fLastOffset != 0) {
527527
R__ASSERT(fFileCounters);
528-
const auto distance = static_cast<std::uint64_t>(std::abs(
529-
static_cast<std::int64_t>(offset) - static_cast<std::int64_t>(fLastOffset)));
528+
const auto distance = static_cast<std::uint64_t>(
529+
std::abs(static_cast<std::int64_t>(offset) - static_cast<std::int64_t>(fLastOffset)));
530530
fFileCounters->fSzSkip.Add(distance);
531531
}
532532
fReader.ReadBuffer(const_cast<void *>(sealedPage.GetBuffer()), sealedPage.GetBufferSize(),

0 commit comments

Comments
 (0)