New version of the CDB classes. Run number added (A.Colla).

diff --git a/STEER/AliCDBDump.cxx b/STEER/AliCDBDump.cxx
index 3bd1d765ea624252e3eb60126818e4ad698d4938..18a5ba21614599b9590ff9c325b8e4b01fa4641e 100644 (file)
--- a/STEER/AliCDBDump.cxx
+++ b/STEER/AliCDBDump.cxx
@@ -250,10 +250,9 @@ Bool_t AliCDBDump::PrepareId(AliCDBId& id) {
 
 
 //_____________________________________________________________________________
-AliCDBId AliCDBDump::GetId(const AliCDBId& query) {
+Bool_t AliCDBDump::GetId(const AliCDBId& query, AliCDBId& result) {
 // look for filename matching query (called by GetEntry)
 
-        AliCDBId result(query.GetAliCDBPath(), -1, -1, -1, -1);
 
         AliCDBRunRange aRunRange; // the runRange got from filename
         Int_t aVersion, aSubVersion; // the version and subVersion got from filename
@@ -295,7 +294,7 @@ AliCDBId AliCDBDump::GetId(const AliCDBId& query) {
                                AliError(Form("More than one object valid for run %d, version %d_%d!", 
                                        query.GetFirstRun(), aVersion, aSubVersion));
                                result.SetRunRange(-1,-1); result.SetVersion(-1); result.SetSubVersion(-1);
-                               return result; 
+                               return kFALSE; 
                                }
                }
                
@@ -318,7 +317,7 @@ AliCDBId AliCDBDump::GetId(const AliCDBId& query) {
                                AliError(Form("More than one object valid for run %d, version %d_%d!", 
                                        query.GetFirstRun(), aVersion, aSubVersion));
                                result.SetRunRange(-1,-1); result.SetVersion(-1); result.SetSubVersion(-1);
-                               return result; 
+                               return kFALSE; 
                        }
                        if( result.GetSubVersion() < aSubVersion) {
 
@@ -348,7 +347,7 @@ AliCDBId AliCDBDump::GetId(const AliCDBId& query) {
                                AliError(Form("More than one object valid for run %d, version %d_%d!", 
                                        query.GetFirstRun(), aVersion, aSubVersion));
                                result.SetRunRange(-1,-1); result.SetVersion(-1); result.SetSubVersion(-1);
-                               return result; 
+                               return kFALSE; 
                        }
                        result.SetVersion(aVersion);
                        result.SetSubVersion(aSubVersion);
@@ -358,11 +357,11 @@ AliCDBId AliCDBDump::GetId(const AliCDBId& query) {
                }
        }
 
-       return result;
+       return kTRUE;
 }
 
 //_____________________________________________________________________________
-AliCDBEntry* AliCDBDump::GetEntry(const AliCDBId& query) {
+AliCDBEntry* AliCDBDump::GetEntry(const AliCDBId& queryId) {
 // get AliCDBEntry from the database
 
        TDirectory::TContext context(gDirectory, fFile);
@@ -372,21 +371,24 @@ AliCDBEntry* AliCDBDump::GetEntry(const AliCDBId& query) {
                 return NULL;
         }
 
-        if (!gDirectory->cd(query.GetPath())) {
+        if (!gDirectory->cd(queryId.GetPath())) {
                 return NULL;
         }
 
-       AliCDBId dataId;
+       AliCDBId dataId(queryId.GetAliCDBPath(), -1, -1, -1, -1);
+        Bool_t result;
 
        // look for a filename matching query requests (path, runRange, version, subVersion)
-       if (!query.HasVersion()) {
+       if (!queryId.HasVersion()) {
                // if version is not specified, first check the selection criteria list
-               dataId = GetId(GetSelection(query));
+               AliCDBId selectedId(queryId);
+               GetSelection(&selectedId);
+               result = GetId(selectedId, dataId);
        } else {
-               dataId = GetId(query);
+               result = GetId(queryId, dataId);
        }
 
-       if (!dataId.IsSpecified()) {
+       if (!result || !dataId.IsSpecified()) {
                return NULL;
        }
        

diff --git a/STEER/AliCDBDump.h b/STEER/AliCDBDump.h
index 9bd54a65a113d7b9cb49fe7ce09659e5f7525af6..832b70e13eee63e5a3a3285410a30eab2bd6ef6f 100644 (file)
--- a/STEER/AliCDBDump.h
+++ b/STEER/AliCDBDump.h
@@ -47,7 +47,7 @@ private:
 
 
        Bool_t PrepareId(AliCDBId& id);
-       AliCDBId GetId(const AliCDBId& query);
+       Bool_t GetId(const AliCDBId& query, AliCDBId& result);
 
 
        void GetEntriesForLevel0(const AliCDBId& query, TList* result);

diff --git a/STEER/AliCDBGrid.cxx b/STEER/AliCDBGrid.cxx
index ddfd6075f7b111984d68b41d83bf72bae2eeefe7..2086fd4dc55c0722c8d170540abf045e21646d06 100644 (file)
--- a/STEER/AliCDBGrid.cxx
+++ b/STEER/AliCDBGrid.cxx
@@ -216,20 +216,18 @@ Bool_t AliCDBGrid::PrepareId(AliCDBId& id) {
 }
 
 //_____________________________________________________________________________
-AliCDBId AliCDBGrid::GetId(const AliCDBId& query) {
+Bool_t AliCDBGrid::GetId(const AliCDBId& query, AliCDBId& result) {
 // look for filename matching query (called by GetEntry)
 
        TString initDir(gGrid->Pwd(0));
 
-       AliCDBId result(query.GetAliCDBPath(), -1, -1, -1, -1);
-
        TString dirName(fDBFolder);
        dirName += query.GetPath(); // dirName = fDBFolder/idPath
 
        if (!gGrid->Cd(dirName,0)) {
                AliError(Form("Directory <%s> not found", (query.GetPath()).Data()));
                AliError(Form("in DB folder %s", fDBFolder.Data()));
-               return result;
+               return kFALSE;
        }
  
        TGridResult *res = gGrid->Ls(dirName);
@@ -251,8 +249,7 @@ AliCDBId AliCDBGrid::GetId(const AliCDBId& query) {
                        if(result.GetVersion() == aVersion) {
                                AliError(Form("More than one object valid for run %d, version %d!", 
                                        query.GetFirstRun(), aVersion));
-                               result.SetRunRange(-1,-1); result.SetVersion(-1);
-                       return result; 
+                       return kFALSE; 
                        }
                        result.SetVersion(aVersion);
                        result.SetFirstRun(aRunRange.GetFirstRun());
@@ -263,8 +260,7 @@ AliCDBId AliCDBGrid::GetId(const AliCDBId& query) {
                        if(result.GetVersion() == aVersion){
                                AliError(Form("More than one object valid for run %d, version %d!", 
                                        query.GetFirstRun(), aVersion));
-                                       result.SetRunRange(-1,-1); result.SetVersion(-1); 
-                                       return result; 
+                                       return kFALSE; 
                        }
                        result.SetVersion(aVersion);
                        result.SetFirstRun(aRunRange.GetFirstRun());
@@ -275,24 +271,27 @@ AliCDBId AliCDBGrid::GetId(const AliCDBId& query) {
        
        gGrid->Cd(initDir.Data(),0);
  
-       return result;
+       return kTRUE;
 }
 
 //_____________________________________________________________________________
 AliCDBEntry* AliCDBGrid::GetEntry(const AliCDBId& queryId) {
 // get AliCDBEntry from the database
 
-       AliCDBId dataId;
+       AliCDBId dataId(queryId.GetAliCDBPath(), -1, -1, -1, -1);
+        Bool_t result;
        
        // look for a filename matching query requests (path, runRange, version, subVersion)
        if (!queryId.HasVersion()) {
                // if version is not specified, first check the selection criteria list
-               dataId = GetId(GetSelection(queryId));
+               AliCDBId selectedId(queryId);
+               GetSelection(&selectedId);
+               result = GetId(selectedId,dataId);
        } else {
-               dataId = GetId(queryId);
+               result = GetId(queryId,dataId);
        }
 
-       if (!dataId.IsSpecified()) return NULL;
+       if (!result || !dataId.IsSpecified()) return NULL;
 
        TString filename;
        if (!IdToFilename(dataId.GetAliCDBRunRange(), dataId.GetVersion(),filename)) {

diff --git a/STEER/AliCDBGrid.h b/STEER/AliCDBGrid.h
index 859f8a0f0f043dd6c7a045046e66ebbbf04d6b66..044e328f7925510d9cd40463c50dcdf9fcc16831 100644 (file)
--- a/STEER/AliCDBGrid.h
+++ b/STEER/AliCDBGrid.h
@@ -43,7 +43,7 @@ private:
        Bool_t IdToFilename(const AliCDBRunRange& runRange, Int_t version, TString& filename);
 
        Bool_t PrepareId(AliCDBId& id);
-       AliCDBId GetId(const AliCDBId& query);
+       Bool_t GetId(const AliCDBId& query, AliCDBId& result);
 
 
        void GetEntriesForLevel0(const char* level0, const AliCDBId& query, TList* result);

diff --git a/STEER/AliCDBLocal.cxx b/STEER/AliCDBLocal.cxx
index 233596d5ba87477c96f3cdde8ab22f87abedb760..5f0fa08f6da4b18c8b4a65146f152c932d568b8d 100644 (file)
--- a/STEER/AliCDBLocal.cxx
+++ b/STEER/AliCDBLocal.cxx
@@ -60,9 +60,9 @@ AliCDBLocal::~AliCDBLocal() {
 
 //_____________________________________________________________________________
 Bool_t AliCDBLocal::FilenameToId(const char* filename, AliCDBRunRange& runRange,
+       Int_t& version, Int_t& subVersion) {
 // build AliCDBId from filename numbers
 
-       Int_t& version, Int_t& subVersion) {
 
         Ssiz_t mSize;
 
@@ -240,11 +240,9 @@ Bool_t AliCDBLocal::PrepareId(AliCDBId& id) {
 }
 
 //_____________________________________________________________________________
-AliCDBId AliCDBLocal::GetId(const AliCDBId& query) {
+Bool_t AliCDBLocal::GetId(const AliCDBId& query, AliCDBId& result) {
 // look for filename matching query (called by GetEntry)
 
-       AliCDBId result(query.GetAliCDBPath(), -1, -1, -1, -1);
-
        TString dirName;
        dirName += fBaseDirectory;
        dirName += '/';
@@ -254,7 +252,7 @@ AliCDBId AliCDBLocal::GetId(const AliCDBId& query) {
        if (!dirPtr) {
                AliError(Form("Directory <%s> not found", (query.GetPath()).Data()));
                AliError(Form("in DB folder %s", fBaseDirectory.Data()));
-               return result;
+               return kFALSE;
        }
 
        const char* filename;   
@@ -298,8 +296,8 @@ AliCDBId AliCDBLocal::GetId(const AliCDBId& query) {
                                && result.GetSubVersion() == aSubVersion){
                                AliError(Form("More than one object valid for run %d, version %d_%d!", 
                                        query.GetFirstRun(), aVersion, aSubVersion));
-                               result.SetRunRange(-1,-1); result.SetVersion(-1); result.SetSubVersion(-1);
-                               return result; 
+                               gSystem->FreeDirectory(dirPtr);
+                               return kFALSE; 
                                }
                }
                
@@ -324,8 +322,8 @@ AliCDBId AliCDBLocal::GetId(const AliCDBId& query) {
                        if(result.GetSubVersion() == aSubVersion){
                                AliError(Form("More than one object valid for run %d, version %d_%d!", 
                                        query.GetFirstRun(), aVersion, aSubVersion));
-                               result.SetRunRange(-1,-1); result.SetVersion(-1); result.SetSubVersion(-1);
-                               return result; 
+                               gSystem->FreeDirectory(dirPtr);
+                               return kFALSE; 
                        }
                        if( result.GetSubVersion() < aSubVersion) {
 
@@ -357,8 +355,8 @@ AliCDBId AliCDBLocal::GetId(const AliCDBId& query) {
                        if(result.GetVersion() == aVersion && result.GetSubVersion() == aSubVersion){
                                AliError(Form("More than one object valid for run %d, version %d_%d!", 
                                        query.GetFirstRun(), aVersion, aSubVersion));
-                               result.SetRunRange(-1,-1); result.SetVersion(-1); result.SetSubVersion(-1);
-                               return result; 
+                               gSystem->FreeDirectory(dirPtr);
+                               return kFALSE; 
                        }
                        result.SetVersion(aVersion);
                        result.SetSubVersion(aSubVersion);
@@ -370,24 +368,27 @@ AliCDBId AliCDBLocal::GetId(const AliCDBId& query) {
 
        gSystem->FreeDirectory(dirPtr);
 
-       return result;
+       return kTRUE;
 }
 
 //_____________________________________________________________________________
 AliCDBEntry* AliCDBLocal::GetEntry(const AliCDBId& queryId) {
 // get AliCDBEntry from the database
 
-       AliCDBId dataId;
-       
+       AliCDBId dataId(queryId.GetAliCDBPath(), -1, -1, -1, -1);
+        Bool_t result;
+               
        // look for a filename matching query requests (path, runRange, version, subVersion)
        if (!queryId.HasVersion()) {
                // if version is not specified, first check the selection criteria list
-               dataId = GetId(GetSelection(queryId));
+               AliCDBId selectedId(queryId);
+               GetSelection(&selectedId);
+               result = GetId(selectedId, dataId);
        } else {
-               dataId = GetId(queryId);
+               result = GetId(queryId, dataId);
        }
 
-       if (!dataId.IsSpecified()) return NULL;
+       if (!result || !dataId.IsSpecified()) return NULL;
 
        TString filename;
        if (!IdToFilename(dataId.GetAliCDBRunRange(), dataId.GetVersion(),

diff --git a/STEER/AliCDBLocal.h b/STEER/AliCDBLocal.h
index d6f46df36ccb6016922cc991fc6d1cf72b932fdc..6969e9012e932e002a6cbfb6c170cde531945668 100644 (file)
--- a/STEER/AliCDBLocal.h
+++ b/STEER/AliCDBLocal.h
@@ -41,7 +41,7 @@ private:
                        Int_t subVersion, TString& filename);
 
        Bool_t PrepareId(AliCDBId& id);
-       AliCDBId GetId(const AliCDBId& query);
+       Bool_t GetId(const AliCDBId& query, AliCDBId& result);
 
        void GetEntriesForLevel0(const char* level0, const AliCDBId& query, TList* result);
        void GetEntriesForLevel1(const char* level0, const char* Level1,

diff --git a/STEER/AliCDBManager.cxx b/STEER/AliCDBManager.cxx
index 3de69d059ead1a0161ce3e58f74a84ec869fc1b1..f469c7f55518dcc69e5c6820c33b93a983bc041e 100644 (file)
--- a/STEER/AliCDBManager.cxx
+++ b/STEER/AliCDBManager.cxx
@@ -65,7 +65,7 @@ void AliCDBManager::Destroy() {
 // delete ALCDBManager instance and active storages
 
        if (fgInstance) {
-               
+               //fgInstance->Delete();
                delete fgInstance;
                fgInstance = 0x0;
        }
@@ -74,15 +74,19 @@ void AliCDBManager::Destroy() {
 //_____________________________________________________________________________
 AliCDBManager::AliCDBManager():
        fDefaultStorage(NULL),
-       fDrainStorage(NULL)
+       fDrainStorage(NULL),
+       fCache(kTRUE),
+       fRun(0)
 {
 // default constuctor
-       fFactories.SetOwner();
+       fFactories.SetOwner(1);
+       fEntryCache.SetOwner(1);
 }
 
 //_____________________________________________________________________________
 AliCDBManager::~AliCDBManager() {
 // destructor
+       ClearCache();
        DestroyActiveStorages();
        fDrainStorage = 0x0;
        fDefaultStorage = 0x0;
@@ -295,10 +299,10 @@ void AliCDBManager::SetSpecificStorage(const char* detName, AliCDBParam* param)
 //_____________________________________________________________________________
 AliCDBStorage* AliCDBManager::GetSpecificStorage(const char* detName) {
 // get storage specific for detector 
-       TObjString objDetName(detName);
-       AliCDBParam *checkPar = (AliCDBParam*) fSpecificStorages.GetValue(&objDetName);
+
+       AliCDBParam *checkPar = (AliCDBParam*) fSpecificStorages.GetValue(detName);
        if(!checkPar){
-               AliError(Form("%s storage not found!",objDetName.String().Data()));
+               AliError(Form("%s storage not found!",detName));
                return NULL;
        } else {
                return GetStorage(checkPar);
@@ -480,6 +484,69 @@ Bool_t AliCDBManager::Put(AliCDBEntry* entry){
 
 }
 
+//_____________________________________________________________________________
+AliCDBEntry* AliCDBManager::Get(const char* path)
+{
+// get an AliCDBEntry object from the database, using fRun as run number
+    
+       if (fRun < 0)
+       {
+               AliError("Run number not set! Use AliCDBManager::SetRun.");
+               return 0;
+       }
+       
+       AliCDBEntry *entry;
+  
+       // first look into map of cached objects
+       entry = (AliCDBEntry*) fEntryCache.GetValue(path);
+       if(entry) return entry;
+
+       // Entry is not in cache -> retrieve it from CDB and cache it!!
+       entry = Get(path, fRun); 
+       if (!entry) return 0;
+   
+       if(fCache) CacheEntry(path, entry);
+  
+       return entry;
+
+}
+
+//_____________________________________________________________________________
+void AliCDBManager::CacheEntry(const char* path, AliCDBEntry* entry)
+{
+// cache AliCDBEntry. Cache is valid until run number is changed.
+
+       AliDebug(2,Form("Filling cache with entry %s",path));
+       fEntryCache.Add(new TObjString(path), entry);
+       AliDebug(2,Form("Cache entries: %d",fEntryCache.GetEntries()));
+
+}
+
+//_____________________________________________________________________________
+void AliCDBManager::SetRun(Long64_t run)
+{
+//
+// Sets current run number.  
+// When the run number changes the caching is cleared.
+//
+  
+       if (fRun == run)
+               return;
+  
+       fRun = run;
+       ClearCache();
+}
+
+//_____________________________________________________________________________
+void AliCDBManager::ClearCache(){
+// clear AliCDBEntry cache
+
+       AliDebug(2,Form("Clearing cache!"));
+       fEntryCache.DeleteAll();
+       AliDebug(2,Form("Cache entries: %d",fEntryCache.GetEntries()));
+
+}
+
 //_____________________________________________________________________________
 void AliCDBManager::DestroyActiveStorages() {
 // delete list of active storages

diff --git a/STEER/AliCDBManager.h b/STEER/AliCDBManager.h
index 9a3d38055f3fb3c00382c22310846588ca516936..3d341efeabc750eb3240c32129918cec50655ea3 100644 (file)
--- a/STEER/AliCDBManager.h
+++ b/STEER/AliCDBManager.h
@@ -75,6 +75,14 @@ class AliCDBManager: public TObject {
 
        Bool_t Put(TObject* object, AliCDBId& id,  AliCDBMetaData* metaData);
        Bool_t Put(AliCDBEntry* entry);
+               
+       void SetCacheFlag(Bool_t cacheFlag) {fCache=cacheFlag;}
+       Bool_t GetCacheFlag() {return fCache;}
+
+       void SetRun(Long64_t run);
+       Long64_t GetRun() {return fRun;}
+
+       AliCDBEntry* Get(const char* path);
 
        void DestroyActiveStorages();
        void DestroyActiveStorage(AliCDBStorage* storage);
@@ -91,15 +99,25 @@ class AliCDBManager: public TObject {
        
        AliCDBStorage* GetActiveStorage(const AliCDBParam* param);
        void PutActiveStorage(AliCDBParam* param, AliCDBStorage* storage);
+       
+       void ClearCache();
+       void CacheEntry(const char* path, AliCDBEntry* entry);
+       
 
        void Init();
        
        TList fFactories;               //! list of registered storage factories
        TMap fActiveStorages;           //! list of active storages
        TMap fSpecificStorages;         //! list of detector-specific storages
+
        AliCDBStorage *fDefaultStorage; //! pointer to default storage
        AliCDBStorage *fDrainStorage;   //! pointer to drain storage
 
+       TMap fEntryCache;       //! cache of the retrieved objects
+
+       Bool_t fCache;                  //! The cache flag
+       Long64_t fRun;                  //! The run number
+
        ClassDef(AliCDBManager, 0);
 };
 

diff --git a/STEER/AliCDBStorage.cxx b/STEER/AliCDBStorage.cxx
index ba74f94b2a1250112d53642432b7d874ee83e0d0..351ba43eb827484392453119075c04165f7786f0 100644 (file)
--- a/STEER/AliCDBStorage.cxx
+++ b/STEER/AliCDBStorage.cxx
@@ -37,7 +37,7 @@ AliCDBStorage::~AliCDBStorage() {
 }
 
 //_____________________________________________________________________________
-AliCDBId AliCDBStorage::GetSelection(const AliCDBId& id) {
+void AliCDBStorage::GetSelection(/*const*/ AliCDBId* id) {
 // return required version and subversion from the list of selection criteria 
        
        TIter iter(&fSelections);
@@ -46,19 +46,19 @@ AliCDBId AliCDBStorage::GetSelection(const AliCDBId& id) {
        // loop on the list of selection criteria
        while ((aSelection = (AliCDBId*) iter.Next())) {
                // check if selection element contains id's path and run (range) 
-               if (aSelection->Comprises(id)) {
+               if (aSelection->Comprises(*id)) {
                        AliDebug(2,Form("Using selection criterion: %s ", aSelection->ToString().Data()));
                        // return required version and subversion
-                       return AliCDBId(id.GetAliCDBPath(), 
-                               id.GetAliCDBRunRange(),
-                               aSelection->GetVersion(), 
-                               aSelection->GetSubVersion());  
+                       
+                       id->SetVersion(aSelection->GetVersion());
+                       id->SetSubVersion(aSelection->GetSubVersion());
+                       return;  
                }
        }
        
        // no valid element is found in the list of selection criteria -> return
        AliDebug(2,"Looking for objects with most recent version");
-       return AliCDBId(id.GetAliCDBPath(), id.GetAliCDBRunRange());
+       return;
 }
 
 //_____________________________________________________________________________

diff --git a/STEER/AliCDBStorage.h b/STEER/AliCDBStorage.h
index 4065e57762fe8348f5beae12d8ea31d8403f90a1..a1ed4bffa5794f9a934b5a2cc5584fdd4b4cff15 100644 (file)
--- a/STEER/AliCDBStorage.h
+++ b/STEER/AliCDBStorage.h
@@ -77,7 +77,7 @@ public:
 protected:
                
        virtual ~AliCDBStorage();       
-       AliCDBId GetSelection(const AliCDBId& id);
+       void    GetSelection(/*const*/ AliCDBId* id);
        virtual AliCDBEntry* GetEntry(const AliCDBId& query) = 0;
        virtual TList* GetEntries(const AliCDBId& query) = 0;
        virtual Bool_t PutEntry(AliCDBEntry* entry) = 0;