Skip to content

[io] TDirectoryFile: propagate returnExistingDirectory to sub-calls and properly apply title #20531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[io] TDirectoryFile: propagate returnExistingDirectory to sub-calls and properly apply title #20531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
057ce40
[io] TDirectoryFile: propagate returnExistingDirectory to sub-calls
silverweed Nov 26, 2025
bcfe688
[io] in TDirectoryFile::mkdir, only apply `title` to the innermost dir.
silverweed Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions io/io/src/TDirectoryFile.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1258,7 +1258,9 @@ TFile *TDirectoryFile::OpenFile(const char *name, Option_t *option,const char *f
/// Create a sub-directory "a" or a hierarchy of sub-directories "a/b/c/...".
///
/// @param name the name or hierarchy of the subdirectory ("a" or "a/b/c")
/// @param title the title
/// @param title the title of the directory. For hierarchies, this is only applied
/// to the innermost directory (so if `name == "a/b/c"` and `title == "my dir"`,
/// only `c` will have the title `"my dir"`).
/// @param returnExistingDirectory if key-name is already existing, the returned
/// value points to preexisting sub-directory if true and to `nullptr` if false.
/// @return a pointer to the created sub-directory, not to the top sub-directory
Expand All @@ -1284,10 +1286,11 @@ TDirectory *TDirectoryFile::mkdir(const char *name, const char *title, Bool_t re
TDirectoryFile *tmpdir = nullptr;
GetObject(workname.Data(), tmpdir);
if (!tmpdir) {
tmpdir = (TDirectoryFile*)mkdir(workname.Data(),title);
// We give all intermediate directories a default title, as `title` is only given to the innermost dir.
tmpdir = (TDirectoryFile *)mkdir(workname.Data(), workname.Data());
if (!tmpdir) return nullptr;
}
return tmpdir->mkdir(slash + 1);
return tmpdir->mkdir(slash + 1, title, returnExistingDirectory);
}

TDirectory::TContext ctxt(this);
Expand Down
24 changes: 24 additions & 0 deletions io/io/test/TFileTests.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

#include "gtest/gtest.h"

#include <ROOT/TestSupport.hxx>

#include "TFile.h"
#include "TMemFile.h"
#include "TDirectory.h"
Expand Down Expand Up @@ -280,6 +282,28 @@ TEST(TDirectoryFile, SeekParent)
EXPECT_EQ(dir11->GetSeekParent(), 239);
}

TEST(TDirectoryFile, RecursiveMkdir)
{
TMemFile f("mkdirtest.root", "RECREATE");
auto dir1 = f.mkdir("a/b/c", "my dir");
EXPECT_NE(dir1, nullptr);
{
ROOT::TestSupport::CheckDiagsRAII diags;
diags.requiredDiag(kError, "TDirectoryFile::mkdir","An object with name c exists already");
auto dir2 = f.mkdir("a/b/c", "", /* returnExisting = */ false);
EXPECT_EQ(dir2, nullptr);
}
auto dir3 = f.mkdir("a/b/c", "foobar", /* returnExisting = */ true);
EXPECT_EQ(dir3, dir1);
EXPECT_STREQ(dir3->GetTitle(), "my dir");
auto dirB = dir3->GetMotherDir();
ASSERT_NE(dirB, nullptr);
EXPECT_STREQ(dirB->GetTitle(), "b");
auto dirA = dirB->GetMotherDir();
ASSERT_NE(dirA, nullptr);
EXPECT_STREQ(dirA->GetTitle(), "a");
}

// https://its.cern.ch/jira/browse/ROOT-10581
TEST(TFile, PersistTObjectStdArray)
{
Expand Down
Loading