Skip to content

parent file map merging #1227

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

Merged
jgrosseo merged 1 commit into from
Sep 11, 2022
Merged

parent file map merging #1227

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
24 changes: 22 additions & 2 deletions Common/Core/aodMerger.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ int main(int argc, char* argv[])
printf("AO2D merging tool. Options: \n");
printf(" --input <inputfile.txt> Contains path to files to be merged. Default: %s\n", inputCollection.c_str());
printf(" --output <outputfile.root> Target output ROOT file. Default: %s\n", outputFileName.c_str());
printf(" --max-size <size in Bytes> Target directory size. Default: %ld\n", maxDirSize);
printf(" --max-size <size in Bytes> Target directory size. Default: %ld. Set to 0 if file is not self-contained.\n", maxDirSize);
printf(" --skip-non-existing-files Flag to allow skipping of non-existing files in the input list.\n");
return -1;
} else {
Expand Down Expand Up @@ -127,6 +127,7 @@ int main(int argc, char* argv[])
TString line;
bool connectedToAliEn = false;
TMap* metaData = nullptr;
TMap* parentFiles = nullptr;
int totalMergedDFs = 0;
int mergedDFs = 0;
while (in.good() && exitCode == 0) {
Expand Down Expand Up @@ -183,6 +184,17 @@ int main(int argc, char* argv[])
}
}

if (((TObjString*)key1)->GetString().EqualTo("parent_files")) {
auto parentFilesCurrentFile = (TMap*)inputFile->Get("parent_files");
if (parentFiles == nullptr) {
parentFiles = new TMap;
}
for (auto pair : *parentFilesCurrentFile) {
parentFiles->Add(((TPair*)pair)->Key(), ((TPair*)pair)->Value());
}
delete parentFilesCurrentFile;
}

if (!((TObjString*)key1)->GetString().BeginsWith("DF_")) {
continue;
}
Expand Down Expand Up @@ -371,7 +383,10 @@ int main(int argc, char* argv[])
// check for not found tables
for (auto& offset : offsets) {
if (offset.second < 0) {
printf("ERROR: Index on %s but no tree found\n", offset.first.c_str());
if (maxDirSize > 0) {
// if maxDirSize is 0 then we do not merge DFs and this error is not an error actually (e.g. for not self-contained derived data)
printf("ERROR: Index on %s but no tree found\n", offset.first.c_str());
}
offset.second = 0;
}
}
Expand All @@ -393,6 +408,11 @@ int main(int argc, char* argv[])
inputFile->Close();
}

if (parentFiles) {
outputFile->cd();
parentFiles->Write("parent_files", TObject::kSingleKey);
}

outputFile->Write();
outputFile->Close();

Expand Down