-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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.
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
Remove redundant data members from InputFileCatalog to reduce memory use #47013
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
5dd08d6
Add tests for InputFileCatalog
makortel cff58ae
Remove InputFileCatalog::fileNames_ as seemingly unnecessary
makortel 3b2822e
Remove InputFileCatalog::logicalFileNames as unnecessary
makortel 5744eaa
Take fileNames by value in InputFileCatalog constructor
makortel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <use name="FWCore/Catalog"/> | ||
| <use name="FWCore/ServiceRegistry"/> | ||
| <use name="catch2"/> | ||
| <bin name="edmCatalogFileLocator_t" file="FileLocator_t.cpp"> | ||
| <bin name="TestFWCoreCatalog" file="FileLocator_t.cpp,InputFileCatalog_t.cpp"> | ||
| </bin> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| #include "FWCore/Catalog/interface/InputFileCatalog.h" | ||
| #include "FWCore/ServiceRegistry/interface/ServiceRegistry.h" | ||
|
|
||
| #include "TestSiteLocalConfig.h" | ||
|
|
||
| #include "catch.hpp" | ||
|
|
||
| TEST_CASE("InputFileCatalog with Rucio data catalog", "[FWCore/Catalog]") { | ||
| edm::ServiceToken tempToken = edmtest::catalog::makeTestSiteLocalConfigToken(); | ||
|
|
||
| SECTION("Empty") { | ||
| edm::ServiceRegistry::Operate operate(tempToken); | ||
| edm::InputFileCatalog catalog({}, ""); | ||
| REQUIRE(catalog.empty()); | ||
| } | ||
|
|
||
| SECTION("isPhysical") { | ||
| REQUIRE(edm::InputFileCatalog::isPhysical("")); | ||
| REQUIRE(not edm::InputFileCatalog::isPhysical("/foo/bar")); | ||
| REQUIRE(edm::InputFileCatalog::isPhysical("file:/foo/bar")); | ||
| } | ||
|
|
||
| SECTION("Default behavior") { | ||
| edm::ServiceRegistry::Operate operate(tempToken); | ||
|
|
||
| edm::InputFileCatalog catalog(std::vector<std::string>{"/store/foo/bar", " file:/foo/bar", "root://foobar "}, ""); | ||
|
|
||
| SECTION("fileNames") { | ||
| SECTION("Catalog 0") { | ||
| auto const names = catalog.fileNames(0); | ||
| REQUIRE(names.size() == 3); | ||
| CHECK(names[0] == "root://cmsxrootd.fnal.gov/store/foo/bar"); | ||
| CHECK(names[1] == "file:/foo/bar"); | ||
| CHECK(names[2] == "root://foobar"); | ||
| } | ||
| // The fileNames() works only for catalog 0 | ||
| // Catalog 1 or 2 leads to a crash because the input file list | ||
| // is a mixture of LFNs and PFNs | ||
| // This isn't really good behavior... | ||
| } | ||
|
|
||
| SECTION("fileCatalogItems") { | ||
| auto const& items = catalog.fileCatalogItems(); | ||
| REQUIRE(items.size() == 3); | ||
| CHECK(items[0].logicalFileName() == "/store/foo/bar"); | ||
| CHECK(items[1].logicalFileName() == ""); | ||
| CHECK(items[2].logicalFileName() == ""); | ||
|
|
||
| REQUIRE(items[0].fileNames().size() == 3); | ||
| REQUIRE(items[1].fileNames().size() == 1); | ||
| REQUIRE(items[2].fileNames().size() == 1); | ||
|
|
||
| SECTION("Catalog 0") { | ||
| CHECK(items[0].fileName(0) == "root://cmsxrootd.fnal.gov/store/foo/bar"); | ||
| CHECK(items[1].fileName(0) == "file:/foo/bar"); | ||
| CHECK(items[2].fileName(0) == "root://foobar"); | ||
| } | ||
| SECTION("Catalog 1") { | ||
| CHECK(items[0].fileName(1) == "root://cmsdcadisk.fnal.gov//dcache/uscmsdisk/store/foo/bar"); | ||
| } | ||
| SECTION("Catalog 2") { CHECK(items[0].fileName(2) == "root://host.domain//pnfs/cms/store/foo/bar"); } | ||
| } | ||
| } | ||
|
|
||
| SECTION("Override catalog") { | ||
| edm::ServiceRegistry::Operate operate(tempToken); | ||
|
|
||
| edm::InputFileCatalog catalog(std::vector<std::string>{"/store/foo/bar", " file:/foo/bar", "root://foobar "}, | ||
| "T1_US_FNAL,,T1_US_FNAL,FNAL_dCache_EOS,XRootD"); | ||
|
|
||
| SECTION("fileNames") { | ||
| auto const names = catalog.fileNames(0); | ||
| REQUIRE(names.size() == 3); | ||
| CHECK(names[0] == "root://cmsdcadisk.fnal.gov//dcache/uscmsdisk/store/foo/bar"); | ||
| CHECK(names[1] == "file:/foo/bar"); | ||
| CHECK(names[2] == "root://foobar"); | ||
| } | ||
|
|
||
| SECTION("fileCatalogItems") { | ||
| auto const& items = catalog.fileCatalogItems(); | ||
| REQUIRE(items.size() == 3); | ||
|
|
||
| CHECK(items[0].logicalFileName() == "/store/foo/bar"); | ||
| CHECK(items[1].logicalFileName() == ""); | ||
| CHECK(items[2].logicalFileName() == ""); | ||
|
|
||
| REQUIRE(items[0].fileNames().size() == 1); | ||
| REQUIRE(items[1].fileNames().size() == 1); | ||
| REQUIRE(items[2].fileNames().size() == 1); | ||
|
|
||
| CHECK(items[0].fileName(0) == "root://cmsdcadisk.fnal.gov//dcache/uscmsdisk/store/foo/bar"); | ||
| CHECK(items[1].fileName(0) == "file:/foo/bar"); | ||
| CHECK(items[2].fileName(0) == "root://foobar"); | ||
| } | ||
| } | ||
|
|
||
| SECTION("useLFNasPFNifLFNnotFound") { | ||
| edm::ServiceRegistry::Operate operate(tempToken); | ||
|
|
||
| edm::InputFileCatalog catalog( | ||
| std::vector<std::string>{"/store/foo/bar", "/tmp/foo/bar", "root://foobar "}, "", true); | ||
|
|
||
| SECTION("fileNames") { | ||
| SECTION("Catalog 0") { | ||
| auto const names = catalog.fileNames(0); | ||
| REQUIRE(names.size() == 3); | ||
| CHECK(names[0] == "root://cmsxrootd.fnal.gov/store/foo/bar"); | ||
| CHECK(names[1] == "/tmp/foo/bar"); | ||
| CHECK(names[2] == "root://foobar"); | ||
| } | ||
| } | ||
|
|
||
| SECTION("fileCatalogItems") { | ||
| auto const& items = catalog.fileCatalogItems(); | ||
| REQUIRE(items.size() == 3); | ||
| CHECK(items[0].logicalFileName() == "/store/foo/bar"); | ||
| CHECK(items[1].logicalFileName() == "/tmp/foo/bar"); | ||
| CHECK(items[2].logicalFileName() == ""); | ||
|
|
||
| REQUIRE(items[0].fileNames().size() == 3); | ||
| REQUIRE(items[1].fileNames().size() == 3); | ||
| REQUIRE(items[2].fileNames().size() == 1); | ||
|
|
||
| SECTION("Catalog 0") { | ||
| CHECK(items[0].fileName(0) == "root://cmsxrootd.fnal.gov/store/foo/bar"); | ||
| CHECK(items[1].fileName(0) == "/tmp/foo/bar"); | ||
| CHECK(items[2].fileName(0) == "root://foobar"); | ||
| } | ||
| SECTION("Catalog 1") { | ||
| CHECK(items[0].fileName(1) == "root://cmsdcadisk.fnal.gov//dcache/uscmsdisk/store/foo/bar"); | ||
| CHECK(items[1].fileName(1) == "/tmp/foo/bar"); | ||
| } | ||
| SECTION("Catalog 2") { | ||
| CHECK(items[0].fileName(2) == "root://host.domain//pnfs/cms/store/foo/bar"); | ||
| CHECK(items[1].fileName(2) == "/tmp/foo/bar"); | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why the clear? The lifetime of the container should make this go away at the end of the function anyway. In fact, why have
maybePfnanyway?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
lfnis moved tofileCatalogItems_member at the end of the loop, line 153. The code has a convention to have the LFN empty when the input file name was a PFN. (I would not change that behavior in this PR, but we could think about it for longer term)Staring at the code more now I agree, the use of
maybePfncould be replaced withlfn(thelfngets trimmed anyway in the else block).