Merge branch 'tickets/DM-40506'

lsst · Aug 28, 2023 · 9aaf64f · 9aaf64f
2 parents 4971fc5 + b3d4bcc
commit 9aaf64f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/src/qmeta/QMetaSelect.cc b/src/qmeta/QMetaSelect.cc
@@ -23,10 +23,6 @@
 // Class header
 #include "qmeta/QMetaSelect.h"
 
-// System headers
-
-// Third-party headers
-
 // LSST headers
 #include "lsst/log/Log.h"
 
@@ -43,23 +39,18 @@ LOG_LOGGER _log = LOG_GET("lsst.qserv.qmeta.QMetaSelect");
 
 namespace lsst::qserv::qmeta {
 
-// Constructors
 QMetaSelect::QMetaSelect(mysql::MySqlConfig const& mysqlConf)
         : _conn(sql::SqlConnectionFactory::make(mysqlConf)) {}
 
-// Destructor
-QMetaSelect::~QMetaSelect() {}
-
 std::unique_ptr<sql::SqlResults> QMetaSelect::select(std::string const& query) {
-    // run query
     sql::SqlErrorObject errObj;
     std::unique_ptr<sql::SqlResults> results(new sql::SqlResults);
     LOGS(_log, LOG_LVL_DEBUG, "Executing query: " << query);
-    if (not _conn->runQuery(query, *results, errObj)) {
+    std::lock_guard<std::mutex> const lock(_connMtx);
+    if (!_conn->runQuery(query, *results, errObj)) {
         LOGS(_log, LOG_LVL_ERROR, "SQL query failed: " << query);
-        throw SqlError(ERR_LOC, errObj);
+        throw qmeta::SqlError(ERR_LOC, errObj);
     }
-
     return results;
 }
 

diff --git a/src/qmeta/QMetaSelect.h b/src/qmeta/QMetaSelect.h
@@ -23,6 +23,8 @@
 #define LSST_QSERV_QMETA_QMETASELECT_H
 
 // System headers
+#include <memory>
+#include <mutex>
 #include <string>
 #include <vector>
 
@@ -38,7 +40,6 @@ namespace lsst::qserv::qmeta {
 
 /**
  *  @ingroup qmeta
- *
  *  @brief Select interface for QMeta database.
  *
  *  This is somewhat special class to used for selecting data from
@@ -48,17 +49,14 @@ namespace lsst::qserv::qmeta {
 
 class QMetaSelect {
 public:
-    /**
-     *  @param mysqlConf: Configuration object for mysql connection
-     */
-    QMetaSelect(mysql::MySqlConfig const& mysqlConf);
+    /// @param mysqlConf: Configuration object for mysql connection
+    explicit QMetaSelect(mysql::MySqlConfig const& mysqlConf);
 
-    // Instances cannot be copied
+    QMetaSelect() = delete;
     QMetaSelect(QMetaSelect const&) = delete;
     QMetaSelect& operator=(QMetaSelect const&) = delete;
 
-    // Destructor
-    virtual ~QMetaSelect();
+    ~QMetaSelect() = default;
 
     /**
      *  @brief Run arbitrary select on a table or view.
@@ -71,9 +69,10 @@ class QMetaSelect {
      *  @returns SqlResults instance
      *  @throws SqlError
      */
-    virtual std::unique_ptr<sql::SqlResults> select(std::string const& query);
+    std::unique_ptr<sql::SqlResults> select(std::string const& query);
 
 protected:
+    std::mutex _connMtx;  ///< The mutex guarding the database connector
     std::shared_ptr<sql::SqlConnection> _conn;
 };