Review changes.

Author: jgates108

src/qdisp/Executive.cc

@@ -440,8 +440,7 @@ void Executive::markCompleted(JobId jobId, bool success) {
     if (!success && !isRowLimitComplete()) {
         {
             lock_guard<mutex> lock(_incompleteJobsMutex);
-            auto iter = _incompleteJobs.find(jobId);
-            if (iter == _incompleteJobs.end()) {
+            if (_incompleteJobs.count(jobId) == 0) {
                 string msg = "Executive::markCompleted failed to find TRACKED " + idStr +
                              " size=" + to_string(_incompleteJobs.size());
                 // If the user query has been cancelled, this is expected for jobs that have not yet
@@ -475,7 +474,7 @@ void Executive::markCompleted(JobId jobId, bool success) {
     }
     _unTrack(jobId);
     if (!success && !isRowLimitComplete()) {
-        squash(string("markComplete error ") + errStr);  // ask to squash
+        squash("markComplete error " + errStr);  // ask to squash
     }
 }
 
@@ -841,7 +840,7 @@ void Executive::checkResultFileSize(uint64_t fileSize) {
         if (total > maxResultTableSizeBytes) {
             LOGS(_log, LOG_LVL_ERROR, "Executive: requesting squash, result file size too large " << total);
             util::Error err(util::ErrorCode::CZAR_RESULT_TOO_LARGE,
-                            string("Incomplete result already too large ") + to_string(total));
+                            "Incomplete result already too large " + to_string(total));
             _multiError.push_back(err);
             squash("czar, file too large");
         }

src/qdisp/Executive.h

@@ -281,7 +281,7 @@ class Executive : public std::enable_shared_from_this<Executive> {
     /// The stats are pushed to qdisp::CzarStats.
     void _updateStats() const;
 
-    util::InstanceCount _icEx{"Executive"};
+    util::InstanceCount const _icEx{"Executive"};
     std::atomic<bool> _empty{true};
     std::shared_ptr<qmeta::MessageStore> _messageStore;  ///< MessageStore for logging
 

src/qdisp/JobDescription.cc

@@ -57,8 +57,6 @@ JobDescription::JobDescription(qmeta::CzarId czarId, QueryId qId, JobId jobId, R
           _chunkQuerySpec(chunkQuerySpec),
           _mock(mock) {}
 
-JobDescription::~JobDescription() { LOGS(_log, LOG_LVL_TRACE, "~JobDescription()"); }
-
 bool JobDescription::incrAttemptCount(std::shared_ptr<Executive> const& exec, bool increase) {
     if (increase) {
         ++_attemptCount;

src/qdisp/JobDescription.h

@@ -69,7 +69,7 @@ class JobDescription {
     JobDescription(JobDescription const&) = delete;
     JobDescription& operator=(JobDescription const&) = delete;
 
-    virtual ~JobDescription();
+    virtual ~JobDescription() = default;
 
     std::string cName(const char* fnc) { return std::string("JobDescription::") + fnc + " " + _qIdStr; }
 

src/qdisp/JobQuery.cc

@@ -63,16 +63,15 @@ bool JobQuery::cancel(bool superfluous) {
         VMUTEX_NOT_HELD(_jqMtx);
         lock_guard lock(_jqMtx);
 
-        ostringstream os;
-        os << _idStr << " cancel";
-        LOGS(_log, LOG_LVL_DEBUG, os.str());
+        string const context = _idStr + " cancel";
+        LOGS(_log, LOG_LVL_DEBUG, context);
         auto exec = _executive.lock();
         if (exec == nullptr) {
             LOGS(_log, LOG_LVL_ERROR, " can't markComplete cancelled, executive == nullptr");
             return false;
         }
         if (!superfluous) {
-            exec->addMultiError(-1, os.str(), util::ErrorCode::RESULT_IMPORT);
+            exec->addMultiError(-1, context, util::ErrorCode::RESULT_IMPORT);
         }
         exec->markCompleted(getJobId(), false);
         return true;

src/rproc/InfileMerger.h

@@ -170,7 +170,7 @@ class InfileMerger {
     bool _applySqlLocal(std::string const& sql, sql::SqlResults& results, sql::SqlErrorObject& errObj);
     bool _sqlConnect(sql::SqlErrorObject& errObj);
 
-    util::InstanceCount _icIm{"InfileMerger"};
+    util::InstanceCount const _icIm{"InfileMerger"};
     std::string _getQueryIdStr();
     void _setQueryIdStr(std::string const& qIdStr);
     void _fixupTargetName();

src/rproc/ProtoRowBuffer.cc

@@ -77,8 +77,6 @@ ProtoRowBuffer::ProtoRowBuffer(proto::ResponseData const& res)
     }
 }
 
-ProtoRowBuffer::~ProtoRowBuffer() { LOGS(_log, LOG_LVL_TRACE, "~ProtoRowBuffer()"); }
-
 /// Fetch a up to a single row from from the Result message
 unsigned ProtoRowBuffer::fetch(char* buffer, unsigned bufLen) {
     unsigned fetched = 0;

src/rproc/ProtoRowBuffer.h

@@ -39,7 +39,7 @@ class ProtoRowBuffer : public mysql::RowBuffer {
     ProtoRowBuffer(proto::ResponseData const& res, int jobId, std::string const& jobIdColName,
                    std::string const& jobIdSqlType, int jobIdMysqlType);
 
-    ~ProtoRowBuffer() override;
+    ~ProtoRowBuffer() override = default;
 
     unsigned fetch(char* buffer, unsigned bufLen) override;
     std::string dump() const override;

src/util/Error.h

@@ -74,7 +74,8 @@ struct ErrorCode {
  */
 class Error {
 public:
-    Error(int code, std::string const& msg = "", int status = ErrorCode::NONE, bool logLvLErr = true);
+    explicit Error(int code, std::string const& msg = "", int status = ErrorCode::NONE,
+                   bool logLvLErr = true);
 
     Error() = default;
     Error(Error const&) = default;
@@ -105,7 +106,7 @@ class Error {
 
 private:
     int _code = ErrorCode::NONE;
-    std::string _msg{""};
+    std::string _msg;
     int _status = ErrorCode::NONE;
 };
 

src/util/InstanceCount.cc

@@ -21,14 +21,14 @@ LOG_LOGGER _log = LOG_GET("lsst.qserv.util.InstanceCount");
 
 namespace lsst::qserv::util {
 
-InstanceCountData InstanceCount::_icData;
+InstanceCount::InstanceCountData InstanceCount::_icData;
 
-InstanceCountData::InstanceCountData() {
+InstanceCount::InstanceCountData::InstanceCountData() {
     std::cout << "InstanceCountData " << " mx=" << (void*)(&_mx) << " _inst=" << (void*)(&_instances)
               << " t=" << (void*)(this) << endl;
 }
 
-InstanceCountData::~InstanceCountData() {
+InstanceCount::InstanceCountData::~InstanceCountData() {
     cout << "~InstanceCountData " << " mx=" << (void*)(&_mx) << " _inst=" << (void*)(&_instances)
          << " t=" << (void*)(this) << endl;
 }