]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - STEER/AliCDBManager.cxx
Next version
[u/mrichter/AliRoot.git] / STEER / AliCDBManager.cxx
index 2e114ff2df23b6c01fc2ebb0dad8ed89c330525b..1b33c45421b597a9778a4a036546b6b1da6527a3 100644 (file)
@@ -34,10 +34,14 @@ ClassImp(AliCDBParam)
 
 ClassImp(AliCDBManager)
 
+//TODO OCDB and Reference folder should not be fully hardcoded but built from run number (or year/LHC period)
+TString AliCDBManager::fgkCondUri("alien://folder=/alice/cern.ch/user/a/aliprod/testCDB/CDB?user=aliprod");
+TString AliCDBManager::fgkRefUri("alien://folder=/alice/cern.ch/user/a/aliprod/testCDB/Reference?user=aliprod");
 AliCDBManager* AliCDBManager::fgInstance = 0x0;
 
 //_____________________________________________________________________________
-AliCDBManager* AliCDBManager::Instance() {
+AliCDBManager* AliCDBManager::Instance()
+{
 // returns AliCDBManager instance (singleton)
 
        if (!fgInstance) {
@@ -58,6 +62,8 @@ void AliCDBManager::Init() {
        if(!gSystem->Exec("root-config --has-alien |grep yes 2>&1 > /dev/null")){ // returns 0 if yes
                AliInfo("AliEn classes enabled in Root. AliCDBGrid factory registered.");
                RegisterFactory(new AliCDBGridFactory());
+               fCondParam = CreateParameter(fgkCondUri);
+               fRefParam = CreateParameter(fgkRefUri);
        }
 }
 //_____________________________________________________________________________
@@ -73,14 +79,23 @@ void AliCDBManager::Destroy() {
 
 //_____________________________________________________________________________
 AliCDBManager::AliCDBManager():
-       fDefaultStorage(NULL),
-       fDrainStorage(NULL),
-       fCache(kTRUE),
-       fRun(-1)
+  TObject(),
+  fCondParam(0),
+  fRefParam(0),
+  fFactories(),
+  fActiveStorages(),
+  fSpecificStorages(),
+  fDefaultStorage(NULL),
+  fDrainStorage(NULL),
+  fEntryCache(),
+  fCache(kTRUE),
+  fRun(-1)
 {
 // default constuctor
        fFactories.SetOwner(1);
-       fEntryCache.SetOwner(1);
+       fActiveStorages.SetOwner(1);
+       fSpecificStorages.SetOwner(1);
+       fEntryCache.SetOwner(1);
 }
 
 //_____________________________________________________________________________
@@ -88,15 +103,11 @@ AliCDBManager::~AliCDBManager() {
 // destructor
        ClearCache();
        DestroyActiveStorages();
+       fFactories.Delete();
        fDrainStorage = 0x0;
        fDefaultStorage = 0x0;
-}
-
-//_____________________________________________________________________________
-AliCDBStorage* AliCDBManager::GetActiveStorage(const AliCDBParam* param) {
-// get a storage object from the list of active storages 
-
-        return (AliCDBStorage*) fActiveStorages.GetValue(param);
+       delete fCondParam;
+       delete fRefParam;
 }
 
 //_____________________________________________________________________________
@@ -122,12 +133,12 @@ Bool_t AliCDBManager::HasStorage(const char* dbString) const {
 
        TIter iter(&fFactories);
 
-       AliCDBStorageFactory* factory;
+       AliCDBStorageFactory* factory=0;
        while ((factory = (AliCDBStorageFactory*) iter.Next())) {
 
                if (factory->Validate(dbString)) {
                        return kTRUE;
-               }       
+               }
        }
 
        return kFALSE;
@@ -139,13 +150,10 @@ AliCDBParam* AliCDBManager::CreateParameter(const char* dbString) const {
 
        TIter iter(&fFactories);
 
-        AliCDBStorageFactory* factory;
+        AliCDBStorageFactory* factory=0;
         while ((factory = (AliCDBStorageFactory*) iter.Next())) {
-
                AliCDBParam* param = factory->CreateParameter(dbString);
-               if (param) {
-                       return param;
-               }
+               if(param) return param;
         }
 
         return NULL;
@@ -157,13 +165,13 @@ AliCDBStorage* AliCDBManager::GetStorage(const char* dbString) {
        
        AliCDBParam* param = CreateParameter(dbString);
        if (!param) {
+               AliError(Form("Failed to activate requested storage! Check URI: %s", dbString));
                return NULL;
-       }       
+       }
 
        AliCDBStorage* aStorage = GetStorage(param);
 
        delete param;
-       
        return aStorage;
 }
 
@@ -171,7 +179,7 @@ AliCDBStorage* AliCDBManager::GetStorage(const char* dbString) {
 AliCDBStorage* AliCDBManager::GetStorage(const AliCDBParam* param) {
 // get storage object from AliCDBParam object
 
-       // if the list of active storages already contains 
+       // if the list of active storages already contains
        // the requested storage, return it
        AliCDBStorage* aStorage = GetActiveStorage(param);
        if (aStorage) {
@@ -180,8 +188,8 @@ AliCDBStorage* AliCDBManager::GetStorage(const AliCDBParam* param) {
 
        TIter iter(&fFactories);
 
-        AliCDBStorageFactory* factory;
-        
+        AliCDBStorageFactory* factory=0;
+
        // loop on the list of registered factories
        while ((factory = (AliCDBStorageFactory*) iter.Next())) {
 
@@ -189,26 +197,35 @@ AliCDBStorage* AliCDBManager::GetStorage(const AliCDBParam* param) {
                aStorage = factory->Create(param);
                if (aStorage) {
                        PutActiveStorage(param->CloneParam(), aStorage);
-                       // if default storage is not set, set to this storage
-                       if(!fDefaultStorage){
-                               fDefaultStorage=aStorage;
-                               AliInfo(Form("Default storage set to: %s",(param->GetURI()).Data()));
+                       aStorage->SetURI(param->GetURI());
+                       if(fRun >= 0) {
+                               aStorage->QueryCDB(fRun);
                        }
                        return aStorage;
                }
         }
 
+       AliError(Form("Failed to activate requested storage! Check URI: %s", param->GetURI().Data()));
+
         return NULL;
 }
 
+//_____________________________________________________________________________
+AliCDBStorage* AliCDBManager::GetActiveStorage(const AliCDBParam* param) {
+// get a storage object from the list of active storages
+
+        return dynamic_cast<AliCDBStorage*> (fActiveStorages.GetValue(param));
+}
+
 //_____________________________________________________________________________
 TList* AliCDBManager::GetActiveStorages() {
 // return list of active storages
+// user has responsibility to delete returned object
 
        TList* result = new TList();
 
-       TIter iter(fActiveStorages.GetTable()); 
-       TPair* aPair;
+       TIter iter(fActiveStorages.GetTable());
+       TPair* aPair=0;
        while ((aPair = (TPair*) iter.Next())) {
                result->Add(aPair->Value());
        }
@@ -226,7 +243,7 @@ void AliCDBManager::SetDrain(const char* dbString) {
 //_____________________________________________________________________________
 void AliCDBManager::SetDrain(const AliCDBParam* param) {
 // set drain storage from AliCDBParam
-       
+
        fDrainStorage = GetStorage(param);
 }
 
@@ -241,7 +258,7 @@ void AliCDBManager::SetDrain(AliCDBStorage* storage) {
 Bool_t AliCDBManager::Drain(AliCDBEntry *entry) {
 // drain retrieved object to drain storage
 
-       AliInfo("Draining into drain storage...");
+       AliDebug(2, "Draining into drain storage...");
        return fDrainStorage->Put(entry);
 }
 
@@ -249,14 +266,15 @@ Bool_t AliCDBManager::Drain(AliCDBEntry *entry) {
 void AliCDBManager::SetDefaultStorage(const char* dbString) {
 // sets default storage from URI string
 
-       fDefaultStorage = GetStorage(dbString); 
+       AliInfo(Form("Setting Default storage to: %s",dbString));
+       fDefaultStorage = GetStorage(dbString);
 }
 
 //_____________________________________________________________________________
 void AliCDBManager::SetDefaultStorage(const AliCDBParam* param) {
 // set default storage from AliCDBParam object
        
-       fDrainStorage = GetStorage(param);
+       fDefaultStorage = GetStorage(param);
 }
 
 //_____________________________________________________________________________
@@ -281,19 +299,28 @@ void AliCDBManager::SetSpecificStorage(const char* calibType, AliCDBParam* param
 // sets storage specific for detector or calibration type (works with AliCDBManager::Get(...))
 // Default storage should be defined prior to any specific storages, e.g.:
 // AliCDBManager::instance()->SetDefaultStorage("alien://");
-// AliCDBManager::instance()->SetSpecificStorage("TPC","local://DB_TPC");
-// AliCDBManager::instance()->SetSpecificStorage("RICH/Align","local://DB_TPCAlign");
+// AliCDBManager::instance()->SetSpecificStorage("TPC/*","local://DB_TPC");
+// AliCDBManager::instance()->SetSpecificStorage("*/Align/*","local://DB_TPCAlign");
+// calibType must be a valid CDB path! (3 level folder structure)
 
        if(!fDefaultStorage) {
-               AliError("Please activate a default storage first!");   
+               AliError("Please activate a default storage first!");
                return;
        }
-       
-       TObjString *objCalibType = new TObjString(calibType);
+
+       AliCDBPath aPath(calibType);
+       if(!aPath.IsValid()){
+               AliError(Form("Not a valid path: %s", calibType));
+               return;
+       }
+
+       TObjString *objCalibType = new TObjString(aPath.GetPath());
        if(fSpecificStorages.Contains(objCalibType)){
-               AliWarning(Form("%s storage already activated! It will be replaced by the new one",
+               AliWarning(Form("Storage \"%s\" already activated! It will be replaced by the new one",
                                        calibType));
-               fSpecificStorages.Remove(objCalibType); 
+               AliCDBParam *checkPar = dynamic_cast<AliCDBParam*> (fSpecificStorages.GetValue(calibType));
+               if(checkPar) delete checkPar;
+               delete fSpecificStorages.Remove(objCalibType);
        }
        GetStorage(param);
        fSpecificStorages.Add(objCalibType, param->CloneParam());
@@ -303,9 +330,12 @@ void AliCDBManager::SetSpecificStorage(const char* calibType, AliCDBParam* param
 AliCDBStorage* AliCDBManager::GetSpecificStorage(const char* calibType) {
 // get storage specific for detector or calibration type 
 
-       AliCDBParam *checkPar = (AliCDBParam*) fSpecificStorages.GetValue(calibType);
+       AliCDBPath calibPath(calibType);
+       if(!calibPath.IsValid()) return NULL;
+       
+       AliCDBParam *checkPar = (AliCDBParam*) fSpecificStorages.GetValue(calibPath.GetPath());
        if(!checkPar){
-               AliError(Form("%s storage not found!",calibType));
+               AliError(Form("%s storage not found!", calibType));
                return NULL;
        } else {
                return GetStorage(checkPar);
@@ -315,13 +345,17 @@ AliCDBStorage* AliCDBManager::GetSpecificStorage(const char* calibType) {
 
 //_____________________________________________________________________________
 AliCDBParam* AliCDBManager::SelectSpecificStorage(const TString& path) {
-// select storage valid for path from the list of specific storages 
+// select storage valid for path from the list of specific storages
+
+       AliCDBPath aPath(path);
+       if(!aPath.IsValid()) return NULL;
 
        TIter iter(&fSpecificStorages);
-       TObjString *aCalibType;
+       TObjString *aCalibType=0;
        AliCDBParam* aPar=0;
        while((aCalibType = (TObjString*) iter.Next())){
-               if(path.Contains(aCalibType->String(), TString::kIgnoreCase)) {
+               AliCDBPath calibTypePath(aCalibType->GetName());
+               if(calibTypePath.Comprises(aPath)) {
                        aPar = (AliCDBParam*) fSpecificStorages.GetValue(aCalibType);
                        break;
                }
@@ -378,25 +412,25 @@ AliCDBEntry* AliCDBManager::Get(const AliCDBId& query) {
                 return NULL;
        }
 
-       if(fCache && query.GetFirstRun() != fRun) 
+       if(fCache && query.GetFirstRun() != fRun)
                AliWarning("Run number explicitly set in query: CDB cache temporarily disabled!");
 
-       
+
        AliCDBEntry *entry=0;
-       
+
        // first look into map of cached objects
-       if(query.GetFirstRun() == fRun) 
+       if(fCache && query.GetFirstRun() == fRun)
                entry = (AliCDBEntry*) fEntryCache.GetValue(query.GetPath());
 
        if(entry) {
-               AliDebug(2,Form("Object %s retrieved from cache !!",query.GetPath().Data()));           
+               AliDebug(2, Form("Object %s retrieved from cache !!",query.GetPath().Data()));
                return entry;
        }
        
        // Entry is not in cache -> retrieve it from CDB and cache it!!   
        AliCDBStorage *aStorage=0;
        AliCDBParam *aPar=SelectSpecificStorage(query.GetPath());
-       
+
        if(aPar) {
                aStorage=GetStorage(aPar);
                TString str = aPar->GetURI();
@@ -414,22 +448,31 @@ AliCDBEntry* AliCDBManager::Get(const AliCDBId& query) {
                AliDebug(2,Form("Caching entry %s !",query.GetPath().Data()));
                CacheEntry(query.GetPath(), entry);
        }
-  
+
        return entry;
                
 }
 
 //_____________________________________________________________________________
-TList* AliCDBManager::GetAll(const AliCDBPath& path, Int_t runNumber, 
+TList* AliCDBManager::GetAll(const AliCDBPath& path, Int_t runNumber,
        Int_t version, Int_t subVersion) {
 // get multiple AliCDBEntry objects from the database
 
+       if(runNumber < 0){
+               // RunNumber is not specified. Try with fRun
+               if (fRun < 0){
+                       AliError("Run number neither specified in query nor set in AliCDBManager! Use AliCDBManager::SetRun.");
+                       return NULL;
+               }
+               runNumber = fRun;
+       }
+
        return GetAll(AliCDBId(path, runNumber, runNumber, version,     
                        subVersion));
 }
 
 //_____________________________________________________________________________
-TList* AliCDBManager::GetAll(const AliCDBPath& path, 
+TList* AliCDBManager::GetAll(const AliCDBPath& path,
        const AliCDBRunRange& runRange, Int_t version, Int_t subVersion) {
 // get multiple AliCDBEntry objects from the database
 
@@ -441,6 +484,8 @@ TList* AliCDBManager::GetAll(const AliCDBId& query) {
 // get multiple AliCDBEntry objects from the database
 // Warning: this method works correctly only for queries of the type "Detector/*"
 //             and not for more specific queries e.g. "Detector/Calib/*" !
+// Warning #2: Entries are cached, but GetAll will keep on retrieving objects from OCDB!
+//             To get an object from cache use Get() function
 
        if(!fDefaultStorage) {
                AliError("No storage set!");
@@ -452,51 +497,66 @@ TList* AliCDBManager::GetAll(const AliCDBId& query) {
                 return NULL;
         }
 
-       if(query.GetPath().BeginsWith('*')){
-                AliError("Query too generic in this context!");
-                return NULL;           
+       if((fSpecificStorages.GetEntries()>0) && query.GetPath().BeginsWith('*')){
+                // if specific storages are active a query with "*" is ambiguous
+               AliError("Query too generic in this context!");
+                return NULL;
        }
 
        if (query.IsAnyRange()) {
                AliError(Form("Unspecified run or runrange: %s",
-                               query.ToString().Data()));      
+                               query.ToString().Data()));
                return NULL;
-       }       
-        
+       }
+
        TObjString objStrLev0(query.GetLevel0());
-       AliCDBParam *aPar = (AliCDBParam*) fSpecificStorages.GetValue(&objStrLev0);
+       //AliCDBParam *aPar = (AliCDBParam*) fSpecificStorages.GetValue(&objStrLev0);
+       AliCDBParam *aPar=SelectSpecificStorage(query.GetPath());
 
-       AliCDBStorage *aStorage;        
+       AliCDBStorage *aStorage;
        if(aPar) {
                aStorage=GetStorage(aPar);
                TString str = aPar->GetURI();
                AliDebug(2,Form("Looking into storage: %s",str.Data()));
-               
+
        } else {
                aStorage=GetDefaultStorage();
-               AliDebug(2,"Looking into default storage");     
+               AliDebug(2,"Looking into default storage");
        }
 
        TList *result = aStorage->GetAll(query);
+       if(!result) return 0;
+
+       // caching entries
+       if(fCache && (query.GetFirstRun() == fRun)){
+
+               TIter iter(result);
+               AliCDBEntry* entry=0;
+               while((entry = dynamic_cast<AliCDBEntry*> (iter.Next()))){
+                       const AliCDBId& anId = entry->GetId();
+                       AliDebug(2,Form("Caching entry %s !", anId.GetPath().Data()));
+                       CacheEntry(anId.GetPath(), entry);
+               }
+       }
 
-        return result;
+       return result;
 }
 
 //_____________________________________________________________________________
-Bool_t AliCDBManager::Put(TObject* object, AliCDBId& id,  AliCDBMetaData* metaData){
+Bool_t AliCDBManager::Put(TObject* object, AliCDBId& id,  AliCDBMetaData* metaData, DataType type){
 // store an AliCDBEntry object into the database
 
        AliCDBEntry anEntry(object, id, metaData);
-       return Put(&anEntry);
+       return Put(&anEntry, type);
 
 }
 
 
 //_____________________________________________________________________________
-Bool_t AliCDBManager::Put(AliCDBEntry* entry){
+Bool_t AliCDBManager::Put(AliCDBEntry* entry, DataType type){
 // store an AliCDBEntry object into the database
 
-       if(!fDefaultStorage) {
+       if(type == kPrivate && !fDefaultStorage) {
                AliError("No storage set!");
                return kFALSE;
        }
@@ -521,19 +581,31 @@ Bool_t AliCDBManager::Put(AliCDBEntry* entry){
        AliCDBId id = entry->GetId();
        AliCDBParam *aPar = SelectSpecificStorage(id.GetPath());
 
-       AliCDBStorage *aStorage;
+       AliCDBStorage *aStorage=0;
        
        if(aPar) {
                aStorage=GetStorage(aPar);
-               TString str = aPar->GetURI();
-               AliDebug(2,Form("Storing object into storage: %s",str.Data()));
-               
        } else {
-               aStorage=GetDefaultStorage();
-               AliDebug(2,"Storing object into default storage");      
+               switch(type){
+                       case kCondition:
+                               aStorage = GetStorage(fCondParam);
+                               break;
+                       case kReference:
+                               aStorage = GetStorage(fRefParam);
+                               break;
+                       case kPrivate:
+                               aStorage = GetDefaultStorage();
+                               break;
+               }
        }
 
-       return aStorage->Put(entry);
+       AliDebug(2,Form("Storing object into storage: %s", aStorage->GetURI().Data()));
+
+       Bool_t result = aStorage->Put(entry, type);
+
+       if(fRun >= 0) QueryCDB();
+
+       return result;
 
 
 }
@@ -550,9 +622,39 @@ void AliCDBManager::CacheEntry(const char* path, AliCDBEntry* entry)
 }
 
 //_____________________________________________________________________________
-void AliCDBManager::SetRun(Long64_t run)
+void AliCDBManager::Print(Option_t* /*option*/) const
+{
+// Print list of active storages and their URIs
+
+       TString output=Form("Run number = %d; ",fRun);
+       output += "Cache is ";
+       if(!fCache) output += "NOT ";
+       output += Form("ACTIVE; Number of active storages: %d\n",fActiveStorages.GetEntries());
+
+       if(fDefaultStorage) {
+               output += Form("\t*** Default Storage URI: \"%s\"\n",fDefaultStorage->GetURI().Data());
+//             AliInfo(output.Data());
+       }
+       if(fSpecificStorages.GetEntries()>0) {
+               TIter iter(fSpecificStorages.GetTable());
+               TPair *aPair=0;
+               Int_t i=1;
+               while((aPair = (TPair*) iter.Next())){
+                       output += Form("\t*** Specific storage %d: Path \"%s\" -> URI \"%s\"\n",
+                               i++, ((TObjString*) aPair->Key())->GetName(),
+                               ((AliCDBParam*) aPair->Value())->GetURI().Data());
+               }
+       }
+       if(fDrainStorage) {
+               output += Form("*** Drain Storage URI: %s\n",fDrainStorage->GetURI().Data());
+       }
+       AliInfo(output.Data());
+}
+
+//_____________________________________________________________________________
+void AliCDBManager::SetRun(Int_t run)
 {
-// Sets current run number.  
+// Sets current run number.
 // When the run number changes the caching is cleared.
   
        if (fRun == run)
@@ -560,6 +662,7 @@ void AliCDBManager::SetRun(Long64_t run)
   
        fRun = run;
        ClearCache();
+       QueryCDB();
 }
 
 //_____________________________________________________________________________
@@ -572,6 +675,44 @@ void AliCDBManager::ClearCache(){
 
 }
 
+//_____________________________________________________________________________
+void AliCDBManager::UnloadFromCache(const char* path){
+// unload cached object
+
+       AliCDBPath queryPath(path);
+       if(!queryPath.IsValid()) return;
+
+       if(!queryPath.IsWildcard()) { // path is not wildcard, get it directly from the cache and unload it!
+               if(fEntryCache.Contains(path)){
+                       AliInfo(Form("Unloading object \"%s\" from cache", path));
+                       TObjString pathStr(path);
+                       AliCDBEntry *entry = dynamic_cast<AliCDBEntry*> (fEntryCache.GetValue(&pathStr));
+                       if(entry) delete entry;
+                       delete fEntryCache.Remove(&pathStr);
+               } else {
+                       AliError(Form("Cache does not contain object \"%s\"!", path))
+               }
+               AliDebug(2,Form("Cache entries: %d",fEntryCache.GetEntries()));
+               return;
+       }
+
+       // path is wildcard: loop on the cache and unload all comprised objects!
+       TIter iter(fEntryCache.GetTable());
+       TPair* pair = 0;
+
+       while((pair = dynamic_cast<TPair*> (iter.Next()))){
+               AliCDBPath entryPath = pair->Key()->GetName();
+               if(queryPath.Comprises(entryPath)) {
+                       AliInfo(Form("Unloading object \"%s\" from cache", entryPath.GetPath().Data()));
+                       TObjString pathStr(entryPath.GetPath().Data());
+                       AliCDBEntry *entry = dynamic_cast<AliCDBEntry*> (fEntryCache.GetValue(&pathStr));
+                       if(entry) delete entry;
+                       delete fEntryCache.Remove(&pathStr);
+               }
+       }
+       AliDebug(2,Form("Cache entries: %d",fEntryCache.GetEntries()));
+}
+
 //_____________________________________________________________________________
 void AliCDBManager::DestroyActiveStorages() {
 // delete list of active storages
@@ -585,14 +726,64 @@ void AliCDBManager::DestroyActiveStorage(AliCDBStorage* /*storage*/) {
 // destroys active storage
 
 /*
-       TIter iter(fActiveStorages.GetTable()); 
+       TIter iter(fActiveStorages.GetTable());
        TPair* aPair;
        while ((aPair = (TPair*) iter.Next())) {
                if(storage == (AliCDBStorage*) aPair->Value())
                        delete fActiveStorages.Remove(aPair->Key());
                        storage->Delete(); storage=0x0;
        }
-*/     
+*/
+
+}
+
+//_____________________________________________________________________________
+void AliCDBManager::QueryCDB() {
+// query default and specific storages for files valid for fRun. Every storage loads the Ids into its list.
+
+       if (fRun < 0){
+               AliError("Run number not yet set! Use AliCDBManager::SetRun.");
+       return;
+       }
+       if (!fDefaultStorage){
+               AliError("Default storage is not set! Use AliCDBManager::SetDefaultStorage");
+       return;
+       }
+       if(fDefaultStorage->GetType() == "alien"){
+               fDefaultStorage->QueryCDB(fRun);
+       } else {
+               AliDebug(2,"Skipping query for valid files, it used only in grid...");
+       }
+
+       TIter iter(&fSpecificStorages);
+       TObjString *aCalibType=0;
+       AliCDBParam* aPar=0;
+       while((aCalibType = dynamic_cast<TObjString*> (iter.Next()))){
+               aPar = (AliCDBParam*) fSpecificStorages.GetValue(aCalibType);
+               if(aPar) {
+                       AliDebug(2,Form("Querying specific storage %s",aCalibType->GetName()));
+                       AliCDBStorage *aStorage = GetStorage(aPar);
+                       if(aStorage->GetType() == "alien"){
+                               aStorage->QueryCDB(fRun,aCalibType->GetName());
+                       } else {
+                               AliDebug(2,
+                                       "Skipping query for valid files, it is used only in grid...");
+                       }
+               }
+       }
+}
+
+//______________________________________________________________________________________________
+const char* AliCDBManager::GetDataTypeName(DataType type)
+{
+  // returns the name (string) of the data type
+
+      switch (type){
+           case kCondition: return "Conditions";
+           case kReference: return "Reference";
+           case kPrivate: return "Private";
+     }
+     return 0;
 
 }
 
@@ -602,7 +793,10 @@ void AliCDBManager::DestroyActiveStorage(AliCDBStorage* /*storage*/) {
 // (AliCDBGridParam, AliCDBLocalParam, AliCDBDumpParam)  //
 ///////////////////////////////////////////////////////////
 
-AliCDBParam::AliCDBParam() {
+AliCDBParam::AliCDBParam():
+  fType(),
+  fURI()
+{
 // constructor
 
 }