From 22cc3a5d3fc0bc17f796559edb05346f66ff3712 Mon Sep 17 00:00:00 2001
From: Philippe Canal <pcanal@fnal.gov>
Date: Wed, 10 Feb 2021 16:26:31 -0600
Subject: [PATCH] TBranch::AddBasket allow to replace an empty write basket
---
tree/tree/src/TBranch.cxx | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tree/tree/src/TBranch.cxx b/tree/tree/src/TBranch.cxx
index 2722d8c6a88..700fe0d5a06 100644
--- a/tree/tree/src/TBranch.cxx
+++ b/tree/tree/src/TBranch.cxx
@@ -528,7 +528,7 @@ TBuffer* TBranch::GetTransientBuffer(Int_t size)
/// the insert (since we'll need to move all the record that are
/// entere 'too early').
/// Warning we also assume that the __current__ write basket is
-/// not present (aka has been removed).
+/// not present (aka has been removed) or is empty (no entries).
void TBranch::AddBasket(TBasket& b, Bool_t ondisk, Long64_t startEntry)
{
@@ -572,13 +572,20 @@ void TBranch::AddBasket(TBasket& b, Bool_t ondisk, Long64_t startEntry)
}
fBasketEntry[where] = startEntry;
+ TBasket *existing = (TBasket*)fBaskets.At(fWriteBasket);
+ if (existing && existing->GetNevBuf()) {
+ Fatal("AddBasket", "Dropping non-empty 'write' basket in %s %s",
+ GetTree()->GetName(), GetName());
+ }
+ delete existing;
if (ondisk) {
fBasketBytes[where] = basket->GetNbytes(); // not for in mem
fBasketSeek[where] = basket->GetSeekKey(); // not for in mem
- fBaskets.AddAtAndExpand(0,fWriteBasket);
+ fBaskets.AddAtAndExpand(0, fWriteBasket);
++fWriteBasket;
} else {
++fNBaskets;
+ // The basket we are adding becomes the new 'write' basket.
fBaskets.AddAtAndExpand(basket,fWriteBasket);
fTree->IncrementTotalBuffers(basket->GetBufferSize());
}
--
GitLab