Skip to content

Commit b88782c

Browse files
committed
[ntuple] clang-format some files
1 parent 43ed943 commit b88782c

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
@@ -504,18 +504,17 @@ ROOT::Internal::RPageSourceFile::PrepareSingleCluster(const RCluster::RKey &clus
504504
std::vector<ROnDiskPageLocator> onDiskPages;
505505
auto activeSize = 0;
506506
auto pageZeroMap = std::make_unique<ROnDiskPageMap>();
507-
PrepareLoadCluster(clusterKey, *pageZeroMap,
508-
[&](ROOT::DescriptorId_t physicalColumnId, ROOT::NTupleSize_t pageNo,
509-
const ROOT::RClusterDescriptor::RPageInfo &pageInfo) {
510-
const auto &pageLocator = pageInfo.GetLocator();
511-
if (pageLocator.GetType() == RNTupleLocator::kTypeUnknown)
512-
throw RException(R__FAIL("tried to read a page with an unknown locator"));
513-
const auto nBytes =
514-
pageLocator.GetNBytesOnStorage() + pageInfo.HasChecksum() * kNBytesPageChecksum;
515-
activeSize += nBytes;
516-
onDiskPages.push_back(
517-
{physicalColumnId, pageNo, pageLocator.GetPosition<std::uint64_t>(), nBytes, 0});
518-
});
507+
PrepareLoadCluster(
508+
clusterKey, *pageZeroMap,
509+
[&](ROOT::DescriptorId_t physicalColumnId, ROOT::NTupleSize_t pageNo,
510+
const ROOT::RClusterDescriptor::RPageInfo &pageInfo) {
511+
const auto &pageLocator = pageInfo.GetLocator();
512+
if (pageLocator.GetType() == RNTupleLocator::kTypeUnknown)
513+
throw RException(R__FAIL("tried to read a page with an unknown locator"));
514+
const auto nBytes = pageLocator.GetNBytesOnStorage() + pageInfo.HasChecksum() * kNBytesPageChecksum;
515+
activeSize += nBytes;
516+
onDiskPages.push_back({physicalColumnId, pageNo, pageLocator.GetPosition<std::uint64_t>(), nBytes, 0});
517+
});
519518

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

0 commit comments

Comments
 (0)