Skip to content

Rework open mode parsing in TNetXNGFile #22778

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
vepadulano wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −9
Open

Rework open mode parsing in TNetXNGFile #22778

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 23 additions & 9 deletions net/netxng/src/TNetXNGFile.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#include <XrdVersion.hh>
#include <iostream>

#include <ROOT/StringUtils.hxx>

namespace {

Int_t ParseOpenMode(Option_t *in, TString &modestr, int &mode, Bool_t assumeRead);
Expand Down Expand Up @@ -177,7 +179,7 @@ TNetXNGFile::TNetXNGFile(const char *url, const char *lurl, Option_t *mode, cons
fReadvIorMax = 2097136;
fReadvIovMax = 1024;

if (ParseOpenMode(mode, fOption, fMode, kTRUE)<0) {
if (ParseOpenMode(mode, fOption, fMode, kTRUE) < 0) {
Error("Open", "could not parse open mode %s", mode);
MakeZombie();
return;
Expand Down Expand Up @@ -708,19 +710,31 @@ Int_t ParseOpenMode(Option_t *in, TString &modestr, int &mode, Bool_t assumeRead
using namespace XrdCl;
modestr = ToUpper(TString(in));

if (modestr == "NEW" || modestr == "CREATE") mode = OpenFlags::New;
else if (modestr == "RECREATE") mode = OpenFlags::Delete;
else if (modestr == "UPDATE") mode = OpenFlags::Update;
else if (modestr == "READ") mode = OpenFlags::Read;
else {
if (!assumeRead) {
return -1;
const static std::unordered_map<std::string, OpenFlags::Flags> strToFlagMap{{"CREATE", OpenFlags::New},
{"NEW", OpenFlags::New},
{"READ", OpenFlags::Read},
{"RECREATE", OpenFlags::Delete},
{"UPDATE", OpenFlags::Update}};

const auto tokens = ROOT::Split(modestr, "_ ", /*skipEmpty*/ true);
for (const auto &token : tokens) {
if (auto it = strToFlagMap.find(token); it != strToFlagMap.end()) {
// Though unnecessary, we substitute the current value of modestr with the specific valid value just found.
// This is done for backwards compatibility: some other code in TFile may rely on the open mode to be exactly
// one of the valid values.
modestr = token;
mode = it->second;
return 0;
}
}

if (assumeRead) {
modestr = "READ";
mode = OpenFlags::Read;
return 0;
}

return 0;
return -1;
}

} // namespace
Expand Down
Loading