Merge branch 'tickets/DM-50445'

Author: iagaponenko

src/ccontrol/UserQueryFactory.cc

@@ -133,8 +133,7 @@ std::shared_ptr<UserQuery> _makeUserQueryProcessList(query::SelectStmt::Ptr& stm
     }
     LOGS(_log, LOG_LVL_DEBUG, "SELECT query is a PROCESSLIST");
     try {
-        return std::make_shared<UserQueryProcessList>(stmt, sharedResources->resultDbConn.get(),
-                                                      sharedResources->qMetaSelect,
+        return std::make_shared<UserQueryProcessList>(stmt, sharedResources->qMetaSelect,
                                                       sharedResources->qMetaCzarId, userQueryId, resultDb);
     } catch (std::exception const& exc) {
         return std::make_shared<UserQueryInvalid>(exc.what());
@@ -411,8 +410,7 @@ UserQuery::Ptr UserQueryFactory::newUserQuery(std::string const& aQuery, std::st
     } else if (UserQueryType::isShowProcessList(query, full)) {
         LOGS(_log, LOG_LVL_DEBUG, "make UserQueryProcessList: full=" << (full ? 'y' : 'n'));
         try {
-            return std::make_shared<UserQueryProcessList>(full, _userQuerySharedResources->resultDbConn.get(),
-                                                          _userQuerySharedResources->qMetaSelect,
+            return std::make_shared<UserQueryProcessList>(full, _userQuerySharedResources->qMetaSelect,
                                                           _userQuerySharedResources->qMetaCzarId, userQueryId,
                                                           resultDb);
         } catch (std::exception const& exc) {

src/ccontrol/UserQueryProcessList.cc

@@ -35,12 +35,14 @@
 // Qserv headers
 #include "css/CssAccess.h"
 #include "css/CssError.h"
+#include "cconfig/CzarConfig.h"
 #include "qdisp/MessageStore.h"
 #include "qmeta/Exceptions.h"
 #include "qmeta/QMetaSelect.h"
 #include "query/FromList.h"
 #include "query/SelectStmt.h"
 #include "sql/SqlConnection.h"
+#include "sql/SqlConnectionFactory.h"
 #include "sql/SqlErrorObject.h"
 #include "sql/SqlBulkInsert.h"
 #include "sql/statement.h"
@@ -61,12 +63,10 @@ namespace lsst::qserv::ccontrol {
 
 // Constructor
 UserQueryProcessList::UserQueryProcessList(std::shared_ptr<query::SelectStmt> const& statement,
-                                           sql::SqlConnection* resultDbConn,
                                            std::shared_ptr<qmeta::QMetaSelect> const& qMetaSelect,
                                            qmeta::CzarId qMetaCzarId, std::string const& userQueryId,
                                            std::string const& resultDb)
-        : _resultDbConn(resultDbConn),
-          _qMetaSelect(qMetaSelect),
+        : _qMetaSelect(qMetaSelect),
           _qMetaCzarId(qMetaCzarId),
           _messageStore(std::make_shared<qdisp::MessageStore>()),
           _resultTableName(::g_nextResultTableId(userQueryId)),
@@ -90,12 +90,10 @@ UserQueryProcessList::UserQueryProcessList(std::shared_ptr<query::SelectStmt> co
     }
 }
 
-UserQueryProcessList::UserQueryProcessList(bool full, sql::SqlConnection* resultDbConn,
-                                           std::shared_ptr<qmeta::QMetaSelect> const& qMetaSelect,
+UserQueryProcessList::UserQueryProcessList(bool full, std::shared_ptr<qmeta::QMetaSelect> const& qMetaSelect,
                                            qmeta::CzarId qMetaCzarId, std::string const& userQueryId,
                                            std::string const& resultDb)
-        : _resultDbConn(resultDbConn),
-          _qMetaSelect(qMetaSelect),
+        : _qMetaSelect(qMetaSelect),
           _qMetaCzarId(qMetaCzarId),
           _messageStore(std::make_shared<qdisp::MessageStore>()),
           _resultTableName(::g_nextResultTableId(userQueryId)),
@@ -156,8 +154,11 @@ void UserQueryProcessList::submit() {
         if (col.colType.sqlType == "TIMESTAMP") createTable += " NULL";
     }
     createTable += ')';
+
     LOGS(_log, LOG_LVL_DEBUG, "creating result table: " << createTable);
-    if (!_resultDbConn->runQuery(createTable, errObj)) {
+    auto const czarConfig = cconfig::CzarConfig::instance();
+    auto const resultDbConn = sql::SqlConnectionFactory::make(czarConfig->getMySqlResultConfig());
+    if (!resultDbConn->runQuery(createTable, errObj)) {
         LOGS(_log, LOG_LVL_ERROR, "failed to create result table: " << errObj.errMsg());
         std::string message = "Internal failure, failed to create result table: " + errObj.errMsg();
         _messageStore->addMessage(-1, "PROCESSLIST", 1051, message, MessageSeverity::MSG_ERROR);
@@ -172,7 +173,7 @@ void UserQueryProcessList::submit() {
     }
 
     // copy stuff over to result table
-    sql::SqlBulkInsert bulkInsert(_resultDbConn, _resultTableName, resColumns);
+    sql::SqlBulkInsert bulkInsert(resultDbConn.get(), _resultTableName, resColumns);
     for (auto& row : *results) {
         std::vector<std::string> values;
         for (unsigned i = 0; i != row.size(); ++i) {
@@ -191,7 +192,7 @@ void UserQueryProcessList::submit() {
                 values.push_back(std::string(ptr, ptr + len));
             } else {
                 // everything else should be quoted
-                values.push_back("'" + _resultDbConn->escapeString(std::string(ptr, ptr + len)) + "'");
+                values.push_back("'" + resultDbConn->escapeString(std::string(ptr, ptr + len)) + "'");
             }
         }
 

src/ccontrol/UserQueryProcessList.h

@@ -44,10 +44,6 @@ namespace lsst::qserv::query {
 class SelectStmt;
 }
 
-namespace lsst::qserv::sql {
-class SqlConnection;
-}
-
 namespace lsst::qserv::ccontrol {
 
 /// UserQueryProcessList : implementation of the UserQuery for SHOWPROCESS statements.
@@ -57,28 +53,25 @@ class UserQueryProcessList : public UserQuery {
      *  Constructor for "SELECT ... FROM  INFORMATION_SCHEMA.PROCESSLIST ...".
      *
      *  @param statement:     Parsed SELECT statement
-     *  @param resultDbConn:  Connection to results database
      *  @param qMetaSelect:   QMetaSelect instance
      *  @param qMetaCzarId:   Czar ID for QMeta queries
      *  @param userQueryId:   Unique string identifying query
      */
     UserQueryProcessList(std::shared_ptr<query::SelectStmt> const& statement,
-                         sql::SqlConnection* resultDbConn,
                          std::shared_ptr<qmeta::QMetaSelect> const& qMetaSelect, qmeta::CzarId qMetaCzarId,
                          std::string const& userQueryId, std::string const& resultDb);
 
     /**
      *  Constructor for "SHOW [FULL] PROCESSLIST".
      *
      *  @param full:          True if FULL is in query
-     *  @param resultDbConn:  Connection to results database
      *  @param qMetaSelect:   QMetaSelect instance
      *  @param qMetaCzarId:   Czar ID for QMeta queries
      *  @param userQueryId:   Unique string identifying query
      */
-    UserQueryProcessList(bool full, sql::SqlConnection* resultDbConn,
-                         std::shared_ptr<qmeta::QMetaSelect> const& qMetaSelect, qmeta::CzarId qMetaCzarId,
-                         std::string const& userQueryId, std::string const& resultDb);
+    UserQueryProcessList(bool full, std::shared_ptr<qmeta::QMetaSelect> const& qMetaSelect,
+                         qmeta::CzarId qMetaCzarId, std::string const& userQueryId,
+                         std::string const& resultDb);
 
     UserQueryProcessList(UserQueryProcessList const&) = delete;
     UserQueryProcessList& operator=(UserQueryProcessList const&) = delete;
@@ -118,7 +111,6 @@ class UserQueryProcessList : public UserQuery {
     /// @return ORDER BY part of SELECT statement that gets executed by the proxy
     std::string _getResultOrderBy() const { return _orderBy; }
 
-    sql::SqlConnection* _resultDbConn;
     std::shared_ptr<qmeta::QMetaSelect> _qMetaSelect;
     qmeta::CzarId const _qMetaCzarId;  ///< Czar ID in QMeta database
     QueryState _qState = UNKNOWN;