Removed unnecessary code.

lsst · Aug 2, 2024 · 83c4ddf · 83c4ddf
1 parent 8c18d02
commit 83c4ddf
Show file tree

Hide file tree

Showing 36 changed files with 240 additions and 1,238 deletions.
diff --git a/src/ccontrol/UserQuerySelect.cc b/src/ccontrol/UserQuerySelect.cc
@@ -86,7 +86,6 @@
 #include "global/constants.h"
 #include "global/LogContext.h"
 #include "proto/worker.pb.h"
-#include "proto/ProtoImporter.h"
 #include "qdisp/Executive.h"
 #include "qdisp/JobQuery.h"
 #include "qmeta/MessageStore.h"
@@ -120,15 +119,6 @@ using namespace std;
 
 namespace lsst::qserv {
 
-/// A class that can be used to parameterize a ProtoImporter<TaskMsg> for
-/// debugging purposes
-class ProtoPrinter {
-public:
-    ProtoPrinter() {}
-    virtual void operator()(std::shared_ptr<proto::TaskMsg> m) { std::cout << "Got taskmsg ok"; }
-    virtual ~ProtoPrinter() {}
-};
-
 ////////////////////////////////////////////////////////////////////////
 // UserQuerySelect implementation
 namespace ccontrol {

diff --git a/src/proto/CMakeLists.txt b/src/proto/CMakeLists.txt
@@ -19,13 +19,3 @@ target_link_libraries(proto PUBLIC
     protobuf
 )
 
-add_executable(testProtocol testProtocol.cc)
-
-target_link_libraries(testProtocol
-    proto
-    crypto
-    Boost::unit_test_framework
-)
-
-add_test(NAME testProtocol COMMAND testProtocol)
-
diff --git a/src/proto/FakeProtocolFixture.h b/src/proto/FakeProtocolFixture.h
diff --git a/src/proto/ProtoImporter.h b/src/proto/ProtoImporter.h
diff --git a/src/proto/ScanTableInfo.h b/src/proto/ScanTableInfo.h
@@ -35,29 +35,16 @@ namespace lsst::qserv::proto {
 
 /// Structure to store shared scan information for a single table.
 ///
-struct ScanTableInfo {
+struct ScanTableInfo { // &&& check if still useful
     using ListOf = std::vector<ScanTableInfo>;
 
     ScanTableInfo() = default;
     ScanTableInfo(std::string const& db_, std::string const& table_) : db(db_), table(table_) {}
     ScanTableInfo(std::string const& db_, std::string const& table_, bool lockInMemory_, int scanRating_)
             : db{db_}, table{table_}, lockInMemory{lockInMemory_}, scanRating{scanRating_} {}
-    ScanTableInfo(TaskMsg_ScanTable const& scanTbl)
-            : db{scanTbl.db()},
-              table{scanTbl.table()},
-              lockInMemory{scanTbl.lockinmemory()},
-              scanRating{scanTbl.scanrating()} {}
 
     ScanTableInfo(ScanTableInfo const&) = default;
 
-    /// Copy contents of this object into a TaskMsg_ScanTable object.
-    void copyToScanTable(TaskMsg_ScanTable* msgScanTbl) const {
-        msgScanTbl->set_db(db);
-        msgScanTbl->set_table(table);
-        msgScanTbl->set_lockinmemory(lockInMemory);
-        msgScanTbl->set_scanrating(scanRating);
-    }
-
     int compare(ScanTableInfo const& rhs) const;
 
     std::string db;