NO SUBCHUNK MATERIALIZATION: cleanup at workers

Author: iagaponenko

src/wbase/Task.cc

@@ -221,7 +221,6 @@ Task::~Task() {
 
 vector<Task::Ptr> Task::createTasks(shared_ptr<proto::TaskMsg> const& taskMsg,
                                     shared_ptr<wbase::FileChannelShared> const& sendChannel,
-                                    shared_ptr<wdb::ChunkResourceMgr> const& chunkResourceMgr,
                                     mysql::MySqlConfig const& mySqlConfig,
                                     shared_ptr<wcontrol::SqlConnMgr> const& sqlConnMgr,
                                     shared_ptr<wpublish::QueriesAndChunks> const& queriesAndChunks,
@@ -259,8 +258,8 @@ vector<Task::Ptr> Task::createTasks(shared_ptr<proto::TaskMsg> const& taskMsg,
     }
     for (auto task : vect) {
         // newQueryRunner sets the `_taskQueryRunner` pointer in `task`.
-        task->setTaskQueryRunner(wdb::QueryRunner::newQueryRunner(task, chunkResourceMgr, mySqlConfig,
-                                                                  sqlConnMgr, queriesAndChunks));
+        task->setTaskQueryRunner(
+                wdb::QueryRunner::newQueryRunner(task, mySqlConfig, sqlConnMgr, queriesAndChunks));
     }
     sendChannel->setTaskCount(vect.size());
 

src/wbase/Task.h

@@ -60,9 +60,6 @@ class FileChannelShared;
 namespace lsst::qserv::wcontrol {
 class SqlConnMgr;
 }
-namespace lsst::qserv::wdb {
-class ChunkResourceMgr;
-}
 namespace lsst::qserv::wpublish {
 class QueriesAndChunks;
 class QueryStatistics;
@@ -165,7 +162,6 @@ class Task : public util::CommandForThreadPool {
     /// Read 'taskMsg' to generate a vector of one or more task objects all using the same 'sendChannel'
     static std::vector<Ptr> createTasks(std::shared_ptr<proto::TaskMsg> const& taskMsg,
                                         std::shared_ptr<wbase::FileChannelShared> const& sendChannel,
-                                        std::shared_ptr<wdb::ChunkResourceMgr> const& chunkResourceMgr,
                                         mysql::MySqlConfig const& mySqlConfig,
                                         std::shared_ptr<wcontrol::SqlConnMgr> const& sqlConnMgr,
                                         std::shared_ptr<wpublish::QueriesAndChunks> const& queriesAndChunks,

src/wcontrol/Foreman.cc

@@ -44,8 +44,6 @@
 #include "wcontrol/ResourceMonitor.h"
 #include "wcontrol/SqlConnMgr.h"
 #include "wcontrol/WorkerStats.h"
-#include "wdb/ChunkResource.h"
-#include "wdb/SQLBackend.h"
 #include "wpublish/QueriesAndChunks.h"
 
 using namespace std;
@@ -90,13 +88,6 @@ Foreman::Foreman(Scheduler::Ptr const& scheduler, unsigned int poolSize, unsigne
           _resourceMonitor(make_shared<ResourceMonitor>()),
           _io_service(),
           _httpServer(qhttp::Server::create(_io_service, 0 /* grab the first available port */)) {
-    // Make the chunk resource mgr
-    // Creating backend makes a connection to the database for making temporary tables.
-    // It will delete temporary tables that it can identify as being created by a worker.
-    // Previous instances of the worker will terminate when they try to use or create temporary tables.
-    // Previous instances of the worker should be terminated before a new worker is started.
-    _chunkResourceMgr = wdb::ChunkResourceMgr::newMgr(make_shared<wdb::SQLBackend>(_mySqlConfig));
-
     assert(_scheduler);  // Cannot operate without scheduler.
 
     LOGS(_log, LOG_LVL_DEBUG, "poolSize=" << poolSize << " maxPoolThreads=" << maxPoolThreads);

src/wcontrol/Foreman.h

@@ -59,7 +59,6 @@ class Server;
 }  // namespace lsst::qserv::qhttp
 
 namespace lsst::qserv::wdb {
-class ChunkResourceMgr;
 class QueryRunner;
 }  // namespace lsst::qserv::wdb
 
@@ -93,7 +92,6 @@ class Scheduler : public wbase::TaskScheduler, public util::CommandQueue {
 };
 
 /// Foreman is used to maintain a thread pool and schedule Tasks for the thread pool.
-/// It also manages sub-chunk tables with the ChunkResourceMgr.
 /// The schedulers may limit the number of threads they will use from the thread pool.
 class Foreman : public wbase::MsgProcessor {
 public:
@@ -117,7 +115,6 @@ class Foreman : public wbase::MsgProcessor {
     Foreman(Foreman const&) = delete;
     Foreman& operator=(Foreman const&) = delete;
 
-    std::shared_ptr<wdb::ChunkResourceMgr> const& chunkResourceMgr() const { return _chunkResourceMgr; }
     mysql::MySqlConfig const& mySqlConfig() const { return _mySqlConfig; }
     std::shared_ptr<wpublish::QueriesAndChunks> const& queriesAndChunks() const { return _queries; }
     std::shared_ptr<wpublish::ChunkInventory> const& chunkInventory() const { return _chunkInventory; }
@@ -139,8 +136,6 @@ class Foreman : public wbase::MsgProcessor {
     virtual nlohmann::json statusToJson(wbase::TaskSelector const& taskSelector) override;
 
 private:
-    std::shared_ptr<wdb::ChunkResourceMgr> _chunkResourceMgr;
-
     util::ThreadPool::Ptr _pool;
     Scheduler::Ptr _scheduler;
 

src/wdb/CMakeLists.txt

@@ -2,10 +2,8 @@ add_library(wdb SHARED)
 add_dependencies(wdb proto)
 
 target_sources(wdb PRIVATE
-    ChunkResource.cc
     QueryRunner.cc
     QuerySql.cc
-    SQLBackend.cc
 )
 
 target_include_directories(wdb PRIVATE
@@ -38,7 +36,6 @@ FUNCTION(wdb_tests)
 ENDFUNCTION()
 
 wdb_tests(
-    testChunkResource
     testQueryRunner
     testQuerySql
 )