tickets/DM-43384

src/ccontrol/UserQueryFactory.cc

@@ -224,6 +224,8 @@ UserQuery::Ptr UserQueryFactory::newUserQuery(std::string const& aQuery, std::st
     // First check for SUBMIT and strip it
     std::string query = aQuery;
 
+    // &&& need to have WorkerChunkMap info at this point
+
     std::string stripped;
     bool async = false;
     if (UserQueryType::isSubmit(query, stripped)) {

src/czar/CMakeLists.txt

@@ -2,6 +2,7 @@ add_library(czar OBJECT)
 
 target_sources(czar PRIVATE
     Czar.cc
+    CzarChunkMap.cc
     HttpCzarSvc.cc
     HttpCzarQueryModule.cc
     HttpModule.cc

src/czar/Czar.cc

@@ -43,6 +43,7 @@
 #include "ccontrol/UserQueryResources.h"
 #include "ccontrol/UserQuerySelect.h"
 #include "ccontrol/UserQueryType.h"
+#include "czar/CzarChunkMap.h"
 #include "czar/CzarErrors.h"
 #include "czar/HttpSvc.h"
 #include "czar/MessageTable.h"
@@ -138,8 +139,7 @@ Czar::Czar(string const& configFilePath, string const& czarName)
           _czarConfig(cconfig::CzarConfig::create(configFilePath, czarName)),
           _idCounter(),
           _uqFactory(),
-          _clientToQuery(),
-          _mutex() {
+          _clientToQuery() {
     // set id counter to milliseconds since the epoch, mod 1 year.
     struct timeval tv;
     gettimeofday(&tv, nullptr);
@@ -156,6 +156,8 @@ Czar::Czar(string const& configFilePath, string const& czarName)
     //       the name of the Czar gets translated into a numeric identifier.
     _czarConfig->setId(_uqFactory->userQuerySharedResources()->qMetaCzarId);
 
+    _czarChunkMap = CzarChunkMap::create(_uqFactory->userQuerySharedResources()->queryMetadata);
+
     // Tell workers to cancel any queries that were submitted before this restart of Czar.
     // Figure out which query (if any) was recorded in Czar database before the restart.
     // The id will be used as the high-watermark for queries that need to be cancelled.

src/czar/Czar.h

@@ -61,6 +61,8 @@ class FileMonitor;
 
 namespace lsst::qserv::czar {
 
+class CzarChunkMap;
+
 /// @addtogroup czar
 
 /**
@@ -179,6 +181,9 @@ class Czar {
 
     /// The HTTP server processing Czar management requests.
     std::shared_ptr<HttpSvc> _controlHttpSvc;
+
+    /// Map of which chunks on which workers and shared scan order.
+    std::shared_ptr<CzarChunkMap> _czarChunkMap;
 };
 
 }  // namespace lsst::qserv::czar