More of the DataProxy to ESProductResolver renaming

[wddgit]

PR description:

In PR #42075, we renamed DataProxy to ESProductResolver. As I was reading through the code for something else, I noticed we had missed some places where the name DataProxy or proxy was still in use and I migrated all that to use ESProductResolver or resolver. This is just renaming so it should not affect behavior. It makes it easier to read this code without mentally context switching between the two names...

At the same time, I made a few other minor cleanup fixes in the files I touched: Doxygen class declarations are now in a namespace, emacs C++ directive is now on the top line (does nothing otherwise), and a few typos in comments fixed.

PR validation:

Core unit tests pass.

[cmsbuild]

cms-bot internal usage

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-46204/42014

• There are other open Pull requests which might conflict with changes you have proposed:
  • File FWCore/Integration/plugins/ESTestProducers.cc modified in PR(s): [RFC] descriptions.addDefault -> descriptions.addWithDefaultLabel #44372

[cmsbuild]

A new Pull Request was created by @wddgit for master.

It involves the following packages:

• FWCore/Concurrency (core)
• FWCore/Framework (core)
• FWCore/Integration (core)
• FWCore/TestProcessor (core)

@Dr15Jones, @cmsbuild, @makortel, @smuzaffar can you please review it and eventually sign? Thanks.
@makortel, @missirol this is something you requested to watch as well.
@antoniovilela, @mandrenguyen, @rappoccio, @sextonkennedy you are the release manager for this.

cms-bot commands are listed here

[wddgit]

please test

[cmsbuild]

-1

Failed Tests: Build
Size: This PR adds an extra 124KB to repository
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-77d206/41903/summary.html
COMMIT: 80ce73c
CMSSW: CMSSW_14_2_X_2024-10-02-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/46204/41903/install.sh to create a dev area with all the needed externals and cmssw changes.

Build

I found compilation error when building:

                 from /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02857/el8_amd64_gcc12/cms/cmssw-patch/CMSSW_14_2_X_2024-10-02-1100/src/FWCore/ParameterSet/interface/ParameterSetDescriptionFiller.h:28,
                 from /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02857/el8_amd64_gcc12/cms/cmssw-patch/CMSSW_14_2_X_2024-10-02-1100/src/FWCore/ParameterSet/interface/ParameterSetDescriptionFillerPluginFactory.h:25,
                 from src/FWCore/Framework/interface/MakerMacros.h:6,
                 from src/PhysicsTools/CondLiteIO/plugins/FWLiteESRecordWriterAnalyzer.cc:32:
src/PhysicsTools/CondLiteIO/plugins/FWLiteESRecordWriterAnalyzer.cc: In member function 'void edm::eventsetup::EventSetupRecordImpl::getImplementation(const DataT*&, edm::ESResolverIndex, bool, const edm::eventsetup::ComponentDescription*&, std::shared_ptr&) const [with DataT = fwliteeswriter::DummyType]':
src/PhysicsTools/CondLiteIO/plugins/FWLiteESRecordWriterAnalyzer.cc:140:77: error: 'keysForProxies_' was not declared in this scope; did you mean 'keysForResolvers_'?
  140 |              iResolverIndex.value() < static_cast(keysForProxies_.size()));
      |                                                                             ^~~~~~~~~~~~~~~
gmake: *** [tmp/el8_amd64_gcc12/src/PhysicsTools/CondLiteIO/plugins/PhysicsToolsCondLiteIOPlugins/FWLiteESRecordWriterAnalyzer.cc.o] Error 1
>> Building edm plugin tmp/el8_amd64_gcc12/src/PhysicsTools/CondLiteIO/plugins/PhysicsToolsCondLiteIOPlugins/libPhysicsToolsCondLiteIOPlugins.so
/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02857/el8_amd64_gcc12/external/gcc/12.3.1-40d504be6370b5a30e3947a6e575ca28/bin/c++ -O3 -pthread -pipe -Werror=main -Werror=pointer-arith -Werror=overlength-strings -Wno-vla -Werror=overflow -std=c++20 -ftree-vectorize -Werror=array-bounds -Werror=format-contains-nul -Werror=type-limits -fvisibility-inlines-hidden -fno-math-errno --param vect-max-version-for-alias-checks=50 -Xassembler --compress-debug-sections -Wno-error=array-bounds -Warray-bounds -fuse-ld=bfd -march=x86-64-v2 -felide-constructors -fmessage-length=0 -Wall -Wno-non-template-friend -Wno-long-long -Wreturn-type -Wextra -Wpessimizing-move -Wclass-memaccess -Wno-cast-function-type -Wno-unused-but-set-parameter -Wno-ignored-qualifiers -Wno-unused-parameter -Wunused -Wparentheses -Werror=return-type -Werror=missing-braces -Werror=unused-value -Werror=unused-label -Werror=address -Werror=format -Werror=sign-compare -Werror=write-strings -Werror=delete-non-virtual-dtor -Werror=strict-aliasing -Werror=narrowing -Werror=unused-but-set-variable -Werror=reorder -Werror=unused-variable -Werror=conversion-null -Werror=return-local-addr -Wnon-virtual-dtor -Werror=switch -fdiagnostics-show-option -Wno-unused-local-typedefs -Wno-attributes -Wno-psabi -Wno-error=unused-variable -DBOOST_DISABLE_ASSERTS -flto=auto -fipa-icf -flto-odr-type-merging -fno-fat-lto-objects -Wodr -shared -Wl,-E    -Wl,-z,defs     tmp/el8_amd64_gcc12/src/PhysicsTools/CondLiteIO/plugins/PhysicsToolsCondLiteIOPlugins/FWLiteESRecordWriterAnalyzer.cc.o tmp/el8_amd64_gcc12/src/PhysicsTools/CondLiteIO/plugins/PhysicsToolsCondLiteIOPlugins/FWLiteESSource.cc.o -o tmp/el8_amd64_gcc12/src/PhysicsTools/CondLiteIO/plugins/PhysicsToolsCondLiteIOPlugins/libPhysicsToolsCondLiteIOPlugins.so -Wl,-E -Wl,--hash-style=gnu -L/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_14_2_X_2024-10-02-1100/biglib/el8_amd64_gcc12 -L/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_14_2_X_2024-10-02-1100/lib/el8_amd64_gcc12 -L/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02857/el8_amd64_gcc12/cms/cmssw-patch/CMSSW_14_2_X_2024-10-02-1100/biglib/el8_amd64_gcc12 -L/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02857/el8_amd64_gcc12/cms/cmssw-patch/CMSSW_14_2_X_2024-10-02-1100/lib/el8_amd64_gcc12 -L/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02857/el8_amd64_gcc12/cms/cmssw-patch/CMSSW_14_2_X_2024-10-02-1100/external/el8_amd64_gcc12/lib -L/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02857/el8_amd64_gcc12/cms/cmssw/CMSSW_14_2_X_2024-09-30-2300/lib/el8_amd64_gcc12 -L/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02857/el8_amd64_gcc12/cms/cmssw/CMSSW_14_2_X_2024-09-30-2300/biglib/el8_amd64_gcc12 -L/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_14_2_X_2024-10-02-1100/static/el8_amd64_gcc12 -L/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02857/el8_amd64_gcc12/cms/cmssw-patch/CMSSW_14_2_X_2024-10-02-1100/static/el8_amd64_gcc12 -L/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02857/el8_amd64_gcc12/cms/cmssw/CMSSW_14_2_X_2024-09-30-2300/static/el8_amd64_gcc12 -lFWCoreFramework -lFWCoreConcurrency -lFWCoreVersion -lPhysicsToolsCondLiteIO -lDataFormatsFWLite -lFWCoreCommon -lFWCoreFWLite -lFWCoreServiceRegistry -lDataFormatsCommon -lFWCoreParameterSet -lFWCoreMessageLogger -lDataFormatsProvenance -lFWCorePluginManager -lFWCoreReflection -lFWCoreUtilities -lTree -lNet -lThread -lMathCore -lRIO -lboost_program_options -lCore -lboost_thread -lboost_date_time -lpcre -lbz2 -luuid -ltbb -llzma -lz -lfmt -lcms-md5 -lcrypt -ldl -lrt -lstdc++fs -ltinyxml2


[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-46204/42044

• There are other open Pull requests which might conflict with changes you have proposed:
  • File FWCore/Integration/plugins/ESTestProducers.cc modified in PR(s): [RFC] descriptions.addDefault -> descriptions.addWithDefaultLabel #44372

[cmsbuild]

Pull request #46204 was updated. @Dr15Jones, @cmsbuild, @makortel, @smuzaffar, @tvami can you please check and sign again.

[tvami]

@cmsbuild , please test

[cmsbuild]

+1

Size: This PR adds an extra 20KB to repository
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-77d206/41921/summary.html
COMMIT: 5e17b60
CMSSW: CMSSW_14_2_X_2024-10-03-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/46204/41921/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

• You potentially added 4 lines to the logs
• Reco comparison results: 124 differences found in the comparisons
• DQMHistoTests: Total files compared: 44
• DQMHistoTests: Total histograms compared: 3331336
• DQMHistoTests: Total failures: 4376
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 3326940
• DQMHistoTests: Total skipped: 20
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 0.0 KiB( 43 files compared)
• Checked 193 log files, 163 edm output root files, 44 DQM output files
• TriggerResults: no differences found

[tvami]

+1

• technical

[makortel]

Comparison differences are related to #39803

[makortel]

The maxmem report shows increases of few tens of MB across all tested workflows. I don't believe these increases are really caused by the changes in this PR (that are just renames), but some artifact resulting e.g. from most of CMSSW being rebuilt. The report looks awfully similar to #46200 (comment), and I'm following up in #46200 (comment)

[makortel]

+core

[cmsbuild]

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @sextonkennedy, @rappoccio, @mandrenguyen, @antoniovilela (and backports should be raised in the release meeting by the corresponding L2)

[mandrenguyen]

+1