Skip to content

Commit 738aa54

Browse files
committed
[ntuple] clang-format some files
1 parent ee8598f commit 738aa54

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

tree/ntuple/inc/ROOT/RPageStorageDaos.hxx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ struct RDaosNTupleAnchor {
7777
/// The object class for user data OIDs, e.g. `SX`
7878
std::string fObjClass{};
7979

80-
bool operator ==(const RDaosNTupleAnchor &other) const {
80+
bool operator==(const RDaosNTupleAnchor &other) const
81+
{
8182
return fVersionAnchor == other.fVersionAnchor && fVersionEpoch == other.fVersionEpoch &&
8283
fVersionMajor == other.fVersionMajor && fVersionMinor == other.fVersionMinor &&
8384
fVersionPatch == other.fVersionPatch && fNBytesHeader == other.fNBytesHeader &&

tree/ntuple/src/RPageStorageFile.cxx

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -509,18 +509,17 @@ ROOT::Internal::RPageSourceFile::PrepareSingleCluster(const RCluster::RKey &clus
509509
std::vector<ROnDiskPageLocator> onDiskPages;
510510
auto activeSize = 0;
511511
auto pageZeroMap = std::make_unique<ROnDiskPageMap>();
512-
PrepareLoadCluster(clusterKey, *pageZeroMap,
513-
[&](ROOT::DescriptorId_t physicalColumnId, ROOT::NTupleSize_t pageNo,
514-
const ROOT::RClusterDescriptor::RPageInfo &pageInfo) {
515-
const auto &pageLocator = pageInfo.GetLocator();
516-
if (pageLocator.GetType() == RNTupleLocator::kTypeUnknown)
517-
throw RException(R__FAIL("tried to read a page with an unknown locator"));
518-
const auto nBytes =
519-
pageLocator.GetNBytesOnStorage() + pageInfo.HasChecksum() * kNBytesPageChecksum;
520-
activeSize += nBytes;
521-
onDiskPages.push_back(
522-
{physicalColumnId, pageNo, pageLocator.GetPosition<std::uint64_t>(), nBytes, 0});
523-
});
512+
PrepareLoadCluster(
513+
clusterKey, *pageZeroMap,
514+
[&](ROOT::DescriptorId_t physicalColumnId, ROOT::NTupleSize_t pageNo,
515+
const ROOT::RClusterDescriptor::RPageInfo &pageInfo) {
516+
const auto &pageLocator = pageInfo.GetLocator();
517+
if (pageLocator.GetType() == RNTupleLocator::kTypeUnknown)
518+
throw RException(R__FAIL("tried to read a page with an unknown locator"));
519+
const auto nBytes = pageLocator.GetNBytesOnStorage() + pageInfo.HasChecksum() * kNBytesPageChecksum;
520+
activeSize += nBytes;
521+
onDiskPages.push_back({physicalColumnId, pageNo, pageLocator.GetPosition<std::uint64_t>(), nBytes, 0});
522+
});
524523

525524
// Linearize the page requests by file offset
526525
std::sort(onDiskPages.begin(), onDiskPages.end(),

0 commit comments

Comments
 (0)