Remove the header filtering & add more tests

Author: mrtineide

CCDB/include/CCDB/BasicCCDBManager.h

@@ -27,7 +27,6 @@
 #include <unordered_map>
 #include <memory>
 #include <cstdlib>
-#include <vector>
 
 class TGeoManager; // we need to forward-declare those classes which should not be cleaned up
 
@@ -102,9 +101,9 @@ class CCDBManagerInstance
   /// query timestamp
   long getTimestamp() const { return mTimestamp; }
 
-  /// retrieve an object of type T from CCDB as stored under path and timestamp. Optional to get the headers. Can give a filter of headers to be saved in cache and returned (if present)
+  /// retrieve an object of type T from CCDB as stored under path and timestamp. Optional to get the headers.
   template <typename T>
-  T* getForTimeStamp(std::string const& path, long timestamp, std::map<std::string, std::string>* headers = nullptr, std::vector<std::string_view> headerFilter = {});
+  T* getForTimeStamp(std::string const& path, long timestamp, std::map<std::string, std::string>* headers = nullptr);
 
   /// retrieve an object of type T from CCDB as stored under path and using the timestamp in the middle of the run
   template <typename T>
@@ -236,7 +235,7 @@ class CCDBManagerInstance
 };
 
 template <typename T>
-T* CCDBManagerInstance::getForTimeStamp(std::string const& path, long timestamp, std::map<std::string, std::string>* headers, std::vector<std::string_view> headerFilter)
+T* CCDBManagerInstance::getForTimeStamp(std::string const& path, long timestamp, std::map<std::string, std::string>* headers)
 {
   mHeaders.clear(); // we clear at the beginning; to allow to retrieve the header information in a subsequent call
   T* ptr = nullptr;
@@ -259,9 +258,7 @@ T* CCDBManagerInstance::getForTimeStamp(std::string const& path, long timestamp,
         mFetchedSize += s;
       }
     }
-    if (!headerFilter.empty()) {
-      LOGP(warn, "Header filter ignored when caching is disabled, giving back all headers");
-    }
+
     if (headers) {
       *headers = mHeaders;
     }
@@ -278,22 +275,11 @@ T* CCDBManagerInstance::getForTimeStamp(std::string const& path, long timestamp,
     ptr = mCCDBAccessor.retrieveFromTFileAny<T>(path, mMetaData, timestamp, &mHeaders, cached.uuid,
                                                 mCreatedNotAfter ? std::to_string(mCreatedNotAfter) : "",
                                                 mCreatedNotBefore ? std::to_string(mCreatedNotBefore) : "");
-
-    // Cache the headers
-    if (headerFilter.empty()) {
-      // No filter, cache all headers
-      for (auto const& h : mHeaders) {
-        cached.cacheOfHeaders[h.first] = h.second;
-      }
-    } else {
-      // Cache only the asked for headers
-      for (auto const& k : headerFilter) {
-        auto it = mHeaders.find(std::string(k));
-        if (it != mHeaders.end()) {
-          cached.cacheOfHeaders.insert_or_assign(it->first, it->second); // Only want to overwrite if the header exists in the source
-        }
-      }
+    // update the cached headers
+    for (auto const& h : mHeaders) {
+      cached.cacheOfHeaders[h.first] = h.second;
     }
+    // return the cached headers
     if (headers) {
       *headers = cached.cacheOfHeaders;
     }
@@ -331,7 +317,7 @@ T* CCDBManagerInstance::getForTimeStamp(std::string const& path, long timestamp,
         size_t s = atol(sh->second.c_str());
         mFetchedSize += s;
         cached.minSize = std::min(s, cached.minSize);
-        cached.maxSize = std::max(s, cached.minSize); // I think this should be maxSize, not minSize
+        cached.maxSize = std::max(s, cached.minSize);
       }
     } else if (mHeaders.count("Error")) { // in case of errors the pointer is 0 and headers["Error"] should be set
       cached.failures++;

CCDB/src/CcdbApi.cxx

@@ -880,7 +880,7 @@ bool CcdbApi::retrieveBlob(std::string const& path, std::string const& targetdir
 
   updateMetaInformationInLocalFile(targetpath.c_str(), &headers, &querysummary);
   if (outHeaders) {
-    *outHeaders = std::move(headers); // Re-use the same headers to give back to the callee
+    *outHeaders = std::move(headers);
   }
   return true;
 }