ignore data dependencies for empty keys

if a DataHandle has a blank key (which in any case is not
allowed in the event store), ignore it when assembling the
data dependencies of the Algorithm or AlgTool

See merge request !169 and atlas/Gaudi!25

GaudiKernel/GaudiKernel/DataHandleHolderVisitor.h

@@ -9,10 +9,13 @@
 class DHHVisitor : public IDataHandleVisitor {
 public:
   DHHVisitor(DataObjIDColl& ido, DataObjIDColl& odo);
+  const DataObjIDColl& ignoredInpKeys() const { return m_ign_i; }
+  const DataObjIDColl& ignoredOutKeys() const { return m_ign_o; }
   
   virtual void visit(const IDataHandleHolder* idhh);
 private:
   DataObjIDColl &m_ido, &m_odo;
+  DataObjIDColl m_ign_i, m_ign_o;
   
 };
 

GaudiKernel/src/Lib/Algorithm.cpp

@@ -213,9 +213,15 @@ StatusCode Algorithm::sysInitialize() {
     for (auto h : m_inputDataObjs) {
       debug() << "\n  + INPUT  " << h;
     }
+    for (auto id : avis.ignoredInpKeys()) {
+      debug() << "\n  + INPUT IGNORED " << id;
+    }
     for (auto h : m_outputDataObjs) {
       debug() << "\n  + OUTPUT " << h;
     }
+    for (auto id : avis.ignoredOutKeys()) {
+      debug() << "\n  + OUTPUT IGNORED " << id;
+    }
     debug() << endmsg;
   }
 

GaudiKernel/src/Lib/DataHandleHolderVisitor.cpp

@@ -13,13 +13,34 @@ DHHVisitor::visit(const IDataHandleHolder* idhh) {
 
   if (idhh == 0) return;
   for (auto h : idhh->inputHandles()) {
-    m_ido.insert(h->fullKey());
+    if (! h->objKey().empty()) { 
+      m_ido.insert(h->fullKey());
+    } else {
+      m_ign_i.insert(h->fullKey());
+    }
   }
   for (auto h : idhh->outputHandles()) {
-    m_odo.insert(h->fullKey());
+    if (! h->objKey().empty()) {
+      m_odo.insert(h->fullKey()); 
+    } else {
+      m_ign_o.insert(h->fullKey());
+    }
+  }
+
+  for (auto id : idhh->extraInputDeps()) {
+    if (! id.key().empty()) { 
+      m_ido.insert( id );
+    } else {
+      m_ign_i.insert(id);
+    }
+  }
+  for (auto id : idhh->extraOutputDeps()) {
+    if (! id.key().empty()) { 
+      m_odo.insert( id );
+    } else {
+      m_ign_o.insert(id);
+    }
   }
-  m_ido.insert(idhh->extraInputDeps().begin(), idhh->extraInputDeps().end());
-  m_odo.insert(idhh->extraOutputDeps().begin(), idhh->extraOutputDeps().end());
 
 }