Improvements based on review feedback

Author: Dr15Jones

CondCore/CondHDF5ESSource/plugins/CondHDF5ESSource.cc

@@ -240,6 +240,11 @@ CondHDF5ESSource::KeyedResolversVector CondHDF5ESSource::registerResolvers(Event
 
 std::vector<edm::eventsetup::ESModuleProducesInfo> CondHDF5ESSource::producesInfo() const {
   std::vector<edm::eventsetup::ESModuleProducesInfo> returnValue;
+  auto size = 0;
+  for (auto const& recInfo : records_) {
+    size += recInfo.dataProducts_.size();
+  }
+  returnValue.reserve(size);
 
   for (auto const& recInfo : records_) {
     EventSetupRecordKey rec{edm::eventsetup::heterocontainer::HCTypeTag::findType(recInfo.name_)};

CondCore/ESSources/plugins/CondDBESSource.cc

@@ -651,6 +651,7 @@ edm::eventsetup::ESProductResolverProvider::KeyedResolversVector CondDBESSource:
 
 std::vector<edm::eventsetup::ESModuleProducesInfo> CondDBESSource::producesInfo() const {
   std::vector<edm::eventsetup::ESModuleProducesInfo> returnValue;
+  returnValue.reserve(m_resolvers.size());
 
   for (auto const& recToResolver : m_resolvers) {
     unsigned int index = returnValue.size();

FWCore/Framework/interface/EDConsumerBase.h

@@ -121,6 +121,8 @@ namespace edm {
 
     std::vector<ModuleConsumesInfo> moduleConsumesInfos() const;
     ///This can only be called before the end of beginJob (after that the underlying data has been deleted)
+    /// The pointers held by ModuleConsumesMinimalESInfo will also be invalid at that time so copies of
+    /// that class should not be held beyond the end of beginJob.
     std::vector<ModuleConsumesMinimalESInfo> moduleConsumesMinimalESInfos() const;
 
     ESResolverIndex const* esGetTokenIndices(edm::Transition iTrans) const {

FWCore/Framework/src/PathsAndConsumesOfModules.cc

@@ -91,8 +91,8 @@ namespace edm {
         auto const& typeID = consumesInfo.type();
 
         if (not consumesInfo.skipCurrentProcess()) {
-          assert(*consumedModuleLabel.data() !=
-                 '\0');  // consumesMany used to create empty labels before we removed consumesMany
+          // consumesMany used to create empty labels before we removed consumesMany
+          assert(*consumedModuleLabel.data() != '\0');
           if (*consumedProcessName.data() != '\0') {  // process name is specified in consumes call
             if (helper.index(kind,
                              typeID,