From 7d17c7c0daa419d3491166b2aafaeffd05eb2162 Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Mon, 14 May 2018 17:00:24 +0200
Subject: [PATCH] [lpa-stream] Prunes OStoreDB includes

---
 scheduler/OStoreDB/OStoreDB.cpp           | 36 +++++++++++------------
 scheduler/OStoreDB/OStoreDB.hpp           | 12 ++++----
 xroot_plugins/XrdSsiCtaRequestMessage.cpp |  5 ++--
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index 38d19d7b19..1d5a6c27b9 100644
--- a/scheduler/OStoreDB/OStoreDB.cpp
+++ b/scheduler/OStoreDB/OStoreDB.cpp
@@ -18,27 +18,27 @@
 
 #include "OStoreDB.hpp"
 #include "MemQueues.hpp"
-#include "common/dataStructures/SecurityIdentity.hpp"
+//#include "common/dataStructures/SecurityIdentity.hpp"
 #include "objectstore/DriveRegister.hpp"
 #include "objectstore/DriveState.hpp"
-#include "objectstore/ArchiveRequest.hpp"
-#include "objectstore/RetrieveRequest.hpp"
+//#include "objectstore/ArchiveRequest.hpp"
+//#include "objectstore/RetrieveRequest.hpp"
 #include "objectstore/Helpers.hpp"
-#include "common/exception/Exception.hpp"
-#include "common/admin/AdminHost.hpp"
-#include "common/admin/AdminUser.hpp"
-#include "common/archiveRoutes/ArchiveRoute.hpp"
-#include "common/utils/utils.hpp"
-#include "scheduler/LogicalLibrary.hpp"
-#include "common/TapePool.hpp"
-#include "common/dataStructures/MountPolicy.hpp"
-#include "tapeserver/castor/tape/tapeserver/daemon/TapeSessionStats.hpp"
-#include <algorithm>
-#include <stdlib.h>     /* srand, rand */
-#include <time.h>       /* time */
-#include <stdexcept>
-#include <set>
-#include <iostream>
+//#include "common/exception/Exception.hpp"
+//#include "common/admin/AdminHost.hpp"
+//#include "common/admin/AdminUser.hpp"
+//#include "common/archiveRoutes/ArchiveRoute.hpp"
+//#include "common/utils/utils.hpp"
+//#include "scheduler/LogicalLibrary.hpp"
+//#include "common/TapePool.hpp"
+//#include "common/dataStructures/MountPolicy.hpp"
+//#include "tapeserver/castor/tape/tapeserver/daemon/TapeSessionStats.hpp"
+//#include <algorithm>
+//#include <stdlib.h>     /* srand, rand */
+//#include <time.h>       /* time */
+//#include <stdexcept>
+//#include <set>
+//#include <iostream>
 
 namespace cta {  
 using namespace objectstore;
diff --git a/scheduler/OStoreDB/OStoreDB.hpp b/scheduler/OStoreDB/OStoreDB.hpp
index c344792d68..0b7573243c 100644
--- a/scheduler/OStoreDB/OStoreDB.hpp
+++ b/scheduler/OStoreDB/OStoreDB.hpp
@@ -22,16 +22,16 @@
 #include "objectstore/RootEntry.hpp"
 #include "objectstore/ArchiveQueue.hpp"
 #include "objectstore/RetrieveQueue.hpp"
-#include "objectstore/Agent.hpp"
+//#include "objectstore/Agent.hpp"
 #include "objectstore/AgentReference.hpp"
+//#include "objectstore/ArchiveRequest.hpp"
+//#include "objectstore/ArchiveQueue.hpp"
 #include "objectstore/ArchiveRequest.hpp"
-#include "objectstore/ArchiveQueue.hpp"
-#include "objectstore/ArchiveRequest.hpp"
-#include "objectstore/DriveRegister.hpp"
+//#include "objectstore/DriveRegister.hpp"
 #include "objectstore/RetrieveRequest.hpp"
 #include "objectstore/SchedulerGlobalLock.hpp"
-#include "catalogue/Catalogue.hpp"
-#include "common/log/Logger.hpp"
+//#include "catalogue/Catalogue.hpp"
+//#include "common/log/Logger.hpp"
 #include "QueueItor.hpp"
 
 namespace cta {
diff --git a/xroot_plugins/XrdSsiCtaRequestMessage.cpp b/xroot_plugins/XrdSsiCtaRequestMessage.cpp
index c0f2e58572..4b152f8790 100644
--- a/xroot_plugins/XrdSsiCtaRequestMessage.cpp
+++ b/xroot_plugins/XrdSsiCtaRequestMessage.cpp
@@ -1238,9 +1238,8 @@ void RequestMessage::processListPendingArchives(const cta::admin::AdminCmd &admi
    auto tapepool = getOptional(OptionString::TAPE_POOL);
 
    // Create a XrdSsi stream object to return the results
-   //stream = new ListPendingQueue<SchedulerDatabase::ArchiveQueueItor_t>(has_flag(OptionBoolean::EXTENDED),
-                   m_scheddb.getArchiveJobItor(tapepool ? tapepool.value() : "");
-//);
+   stream = new ListPendingQueue<OStoreDB::ArchiveQueueItor_t>(has_flag(OptionBoolean::EXTENDED),
+      m_scheddb.getArchiveJobItor(tapepool ? tapepool.value() : ""));
 
    // Send the column headers in the metadata
    if(has_flag(OptionBoolean::SHOW_HEADER)) {
-- 
GitLab