diff --git a/tree/forest/v7/inc/ROOT/RColumn.hxx b/tree/forest/v7/inc/ROOT/RColumn.hxx index d9abc0f99890b5363cacd2b68f53a0ad043df440..5486d74fd544fca7ff289e5e8e292bad7b61f8bc 100644 --- a/tree/forest/v7/inc/ROOT/RColumn.hxx +++ b/tree/forest/v7/inc/ROOT/RColumn.hxx @@ -71,10 +71,10 @@ public: void Connect(RPageStorage* pageStorage); void Append(const RColumnElementBase& element) { - void* dst = fHeadPage.Reserve(1); + void* dst = fHeadPage.TryGrow(1); if (dst == nullptr) { Flush(); - dst = fHeadPage.Reserve(1); + dst = fHeadPage.TryGrow(1); R__ASSERT(dst != nullptr); } element.Serialize(dst, 1); @@ -82,7 +82,7 @@ public: } void AppendV(const RColumnElementBase& elemArray, std::size_t count) { - void* dst = fHeadPage.Reserve(count); + void* dst = fHeadPage.TryGrow(count); if (dst == nullptr) { for (unsigned i = 0; i < count; ++i) { Append(RColumnElementBase(elemArray, i)); diff --git a/tree/forest/v7/inc/ROOT/RPage.hxx b/tree/forest/v7/inc/ROOT/RPage.hxx index 56b49c48814970504505685a2e603fd276c7422d..a28e3a06a9bb781f3fab5931cb007de98261b91e 100644 --- a/tree/forest/v7/inc/ROOT/RPage.hxx +++ b/tree/forest/v7/inc/ROOT/RPage.hxx @@ -95,7 +95,7 @@ public: void* GetBuffer() const { return fBuffer; } /// Return a pointer after the last element that has space for nElements new elements. If there is not enough capacity, /// return nullptr - void* Reserve(std::size_t nElements) { + void* TryGrow(std::size_t nElements) { size_t offset = fSize; size_t nbyte = nElements * fElementSize; if (offset + nbyte > fCapacity) { diff --git a/tree/forest/v7/src/RPageStorageRoot.cxx b/tree/forest/v7/src/RPageStorageRoot.cxx index 955d2f82bce4239d652b3154bd8aa1b0e067e7a0..22858ab39a6bc45e93c169ab5576d01f8f53d50a 100644 --- a/tree/forest/v7/src/RPageStorageRoot.cxx +++ b/tree/forest/v7/src/RPageStorageRoot.cxx @@ -314,7 +314,7 @@ void ROOT::Experimental::Detail::RPageSourceRoot::PopulatePage( } auto elemsInPage = firstOutsidePage - firstInPage; - void* buf = page->Reserve(elemsInPage); + void* buf = page->TryGrow(elemsInPage); R__ASSERT(buf != nullptr); auto clusterId = fMapper.fColumnIndex[columnId].fClusterId[pageIdx];