Removed unneccesary data member from the result merger

The older implementation of the class MergingHandler had a data member that had no pracical use.
lsst · Jan 24, 2024 · 0928919 · 0928919
1 parent 3253f35
commit 0928919
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/src/ccontrol/MergingHandler.cc b/src/ccontrol/MergingHandler.cc
@@ -388,15 +388,13 @@ MergingHandler::~MergingHandler() { LOGS(_log, LOG_LVL_DEBUG, __func__); }
 bool MergingHandler::flush(proto::ResponseSummary const& responseSummary, int& resultRows) {
     _wName = responseSummary.wname();
 
-    int const jobId = responseSummary.jobid();
-    _jobIds.insert(jobId);
-
     // Why this is needed to ensure the job query would be staying alive for the duration
     // of the operation?
     auto const jobQuery = getJobQuery().lock();
 
     LOGS(_log, LOG_LVL_TRACE,
-         "MergingHandler::" << __func__ << " transmitsize=" << responseSummary.transmitsize()
+         "MergingHandler::" << __func__ << " jobid=" << responseSummary.jobid()
+                            << " transmitsize=" << responseSummary.transmitsize()
                             << " rowcount=" << responseSummary.rowcount() << " rowSize="
                             << " attemptcount=" << responseSummary.attemptcount() << " errorcode="
                             << responseSummary.errorcode() << " errormsg=" << responseSummary.errormsg());
@@ -437,7 +435,7 @@ bool MergingHandler::flush(proto::ResponseSummary const& responseSummary, int& r
         throw util::Bug(ERR_LOC, err);
     }
     if (success) {
-        _infileMerger->mergeCompleteFor(_jobIds);
+        _infileMerger->mergeCompleteFor(responseSummary.jobid());
     }
     return success;
 }

diff --git a/src/ccontrol/MergingHandler.h b/src/ccontrol/MergingHandler.h
@@ -27,7 +27,6 @@
 #include <atomic>
 #include <memory>
 #include <mutex>
-#include <set>
 
 // Qserv headers
 #include "qdisp/ResponseHandler.h"
@@ -111,9 +110,6 @@ class MergingHandler : public qdisp::ResponseHandler {
     mutable std::mutex _errorMutex;                      ///< Protect readers from partial updates
     bool _flushed{false};                                ///< flushed to InfileMerger?
     std::string _wName{"~"};                             ///< worker name
-    /// Set of jobIds added in this request. Using std::set to prevent duplicates when the same
-    /// jobId has multiple merge calls.
-    std::set<int> _jobIds;
 };
 
 }  // namespace lsst::qserv::ccontrol

diff --git a/src/rproc/InfileMerger.cc b/src/rproc/InfileMerger.cc
@@ -213,11 +213,9 @@ void InfileMerger::_setQueryIdStr(std::string const& qIdStr) {
     _queryIdStrSet = true;
 }
 
-void InfileMerger::mergeCompleteFor(std::set<int> const& jobIds) {
+void InfileMerger::mergeCompleteFor(int jobId) {
     std::lock_guard<std::mutex> resultSzLock(_mtxResultSizeMtx);
-    for (int jobId : jobIds) {
-        _totalResultSize += _perJobResultSize[jobId];
-    }
+    _totalResultSize += _perJobResultSize[jobId];
 }
 
 bool InfileMerger::merge(proto::ResponseSummary const& responseSummary,

diff --git a/src/rproc/InfileMerger.h b/src/rproc/InfileMerger.h
@@ -162,8 +162,8 @@ class InfileMerger {
     /// @return true if merge was successfully imported.
     bool merge(proto::ResponseSummary const& responseSummary, proto::ResponseData const& responseData);
 
-    /// Indicate the the merge for all of the jobs in jobIds is complete.
-    void mergeCompleteFor(std::set<int> const& jobIds);
+    /// Indicate the merge for the job is complete.
+    void mergeCompleteFor(int jobId);
 
     /// @return error details if finalize() returns false
     util::Error const& getError() const { return _error; }