Migated async algorithms (jobs) classes into the dedicated subfolder …

…jobs/
lsst · Dec 20, 2023 · 9eb3203 · 9eb3203
1 parent 34a8c15
commit 9eb3203
Show file tree

Hide file tree

Showing 103 changed files with 181 additions and 182 deletions.
diff --git a/src/replica/CMakeLists.txt b/src/replica/CMakeLists.txt
@@ -10,7 +10,7 @@ target_sources(replica PRIVATE
     ${REPLICA_PB_SRCS}
     ${REPLICA_PB_HDRS}
     apps/AbortTransactionApp.cc
-    AbortTransactionJob.cc
+    jobs/AbortTransactionJob.cc
     qserv/AddReplicaQservMgtRequest.cc
     apps/AdminApp.cc
     apps/Application.cc
@@ -22,7 +22,7 @@ target_sources(replica PRIVATE
     ChunkedTable.cc
     apps/ChunksApp.cc
     apps/ClusterHealthApp.cc
-    ClusterHealthJob.cc
+    jobs/ClusterHealthJob.cc
     Common.cc
     apps/ConfigApp.cc
     apps/ConfigAppBase.cc
@@ -40,7 +40,7 @@ target_sources(replica PRIVATE
     config/ConfigurationSchema.cc
     Controller.cc
     apps/ControllerApp.cc
-    CreateReplicaJob.cc
+    jobs/CreateReplicaJob.cc
     Csv.cc
     mysql/DatabaseMySQL.cc
     mysql/DatabaseMySQLGenerator.cc
@@ -51,10 +51,10 @@ target_sources(replica PRIVATE
     database/DatabaseServicesMySQL.cc
     database/DatabaseServicesPool.cc
     apps/DatabaseTestApp.cc
-    DeleteReplicaJob.cc
+    jobs/DeleteReplicaJob.cc
     DeleteRequest.cc
     apps/DeleteWorkerApp.cc
-    DeleteWorkerJob.cc
+    jobs/DeleteWorkerJob.cc
     DeleteWorkerTask.cc
     DisposeRequest.cc
     EchoRequest.cc
@@ -70,11 +70,11 @@ target_sources(replica PRIVATE
     apps/FileServerApp.cc
     FileServerConnection.cc
     FileUtils.cc
-    FindAllJob.cc
+    jobs/FindAllJob.cc
     FindAllRequest.cc
     FindRequest.cc
     apps/FixUpApp.cc
-    FixUpJob.cc
+    jobs/FixUpJob.cc
     qserv/GetReplicasQservMgtRequest.cc
     qserv/GetDbStatusQservMgtRequest.cc
     qserv/GetConfigQservCzarMgtRequest.cc
@@ -107,7 +107,7 @@ target_sources(replica PRIVATE
     HttpSvc.cc
     HttpWorkerStatusModule.cc
     apps/DirectorIndexApp.cc
-    DirectorIndexJob.cc
+    jobs/DirectorIndexJob.cc
     DirectorIndexRequest.cc
     ingest/IngestClient.cc
     ingest/IngestFileSvc.cc
@@ -120,32 +120,32 @@ target_sources(replica PRIVATE
     ingest/IngestResourceMgrT.cc
     ingest/IngestSvc.cc
     ingest/IngestSvcConn.cc
-    Job.cc
+    jobs/Job.cc
     apps/MasterControllerHttpApp.cc
     Messenger.cc
     MessengerConnector.cc
     apps/MessengerTestApp.cc
     apps/MoveApp.cc
-    MoveReplicaJob.cc
+    jobs/MoveReplicaJob.cc
     apps/MySQLTestApp.cc
     Mutex.cc
     NamedMutexRegistry.cc
     Performance.cc
     ProtocolBuffer.cc
     apps/PurgeApp.cc
-    PurgeJob.cc
+    jobs/PurgeJob.cc
     apps/QhttpTestApp.cc
     qserv/QservCzarMgtRequest.cc
-    QservGetReplicasJob.cc
+    jobs/QservGetReplicasJob.cc
     qserv/QservMgtRequest.cc
     qserv/QservMgtServices.cc
-    QservStatusJob.cc
-    QservSyncJob.cc
+    jobs/QservStatusJob.cc
+    jobs/QservSyncJob.cc
     apps/QservWorkerApp.cc
     qserv/QservWorkerMgtRequest.cc
     apps/QservWorkerPingApp.cc
     apps/RebalanceApp.cc
-    RebalanceJob.cc
+    jobs/RebalanceJob.cc
     registry/Registry.cc
     apps/RegistryHttpApp.cc
     registry/RegistryHttpSvc.cc
@@ -154,53 +154,53 @@ target_sources(replica PRIVATE
     qserv/RemoveReplicaQservMgtRequest.cc
     ReplicaInfo.cc
     apps/ReplicateApp.cc
-    ReplicateJob.cc
+    jobs/ReplicateJob.cc
     ReplicationRequest.cc
     ReplicationTask.cc
     Request.cc
     RequestMessenger.cc
     RequestTracker.cc
-    ServiceManagementJob.cc
+    jobs/ServiceManagementJob.cc
     ServiceManagementRequest.cc
     ServiceManagementRequestBase.cc
     ServiceProvider.cc
     qserv/SetReplicasQservMgtRequest.cc
-    SqlAlterTablesJob.cc
+    jobs/SqlAlterTablesJob.cc
     SqlAlterTablesRequest.cc
     apps/SqlApp.cc
-    SqlCreateDbJob.cc
+    jobs/SqlCreateDbJob.cc
     SqlCreateDbRequest.cc
-    SqlCreateIndexesJob.cc
+    jobs/SqlCreateIndexesJob.cc
     SqlCreateIndexesRequest.cc
-    SqlCreateTableJob.cc
+    jobs/SqlCreateTableJob.cc
     SqlCreateTableRequest.cc
-    SqlCreateTablesJob.cc
+    jobs/SqlCreateTablesJob.cc
     SqlCreateTablesRequest.cc
-    SqlDeleteDbJob.cc
+    jobs/SqlDeleteDbJob.cc
     SqlDeleteDbRequest.cc
-    SqlDeleteTableJob.cc
-    SqlDeleteTablePartitionJob.cc
+    jobs/SqlDeleteTableJob.cc
+    jobs/SqlDeleteTablePartitionJob.cc
     SqlDeleteTablePartitionRequest.cc
     SqlDeleteTableRequest.cc
-    SqlDisableDbJob.cc
+    jobs/SqlDisableDbJob.cc
     SqlDisableDbRequest.cc
-    SqlDropIndexesJob.cc
+    jobs/SqlDropIndexesJob.cc
     SqlDropIndexesRequest.cc
-    SqlEnableDbJob.cc
+    jobs/SqlEnableDbJob.cc
     SqlEnableDbRequest.cc
-    SqlGetIndexesJob.cc
+    jobs/SqlGetIndexesJob.cc
     SqlGetIndexesRequest.cc
-    SqlGrantAccessJob.cc
+    jobs/SqlGrantAccessJob.cc
     SqlGrantAccessRequest.cc
-    SqlJob.cc
-    SqlJobResult.cc
-    SqlQueryJob.cc
+    jobs/SqlJob.cc
+    jobs/SqlJobResult.cc
+    jobs/SqlQueryJob.cc
     SqlQueryRequest.cc
-    SqlRemoveTablePartitionsJob.cc
+    jobs/SqlRemoveTablePartitionsJob.cc
     SqlRemoveTablePartitionsRequest.cc
     SqlRequest.cc
     SqlResultSet.cc
-    SqlRowStatsJob.cc
+    jobs/SqlRowStatsJob.cc
     SqlRowStatsRequest.cc
     SqlSchemaUtils.cc
     StatusRequest.cc
@@ -214,7 +214,7 @@ target_sources(replica PRIVATE
     database/TransactionContrib.cc
     apps/TransactionsApp.cc
     apps/VerifyApp.cc
-    VerifyJob.cc
+    jobs/VerifyJob.cc
     apps/WorkerApp.cc
     worker/WorkerDeleteRequest.cc
     worker/WorkerDirectorIndexRequest.cc

diff --git a/src/replica/DeleteWorkerTask.h b/src/replica/DeleteWorkerTask.h
@@ -26,7 +26,7 @@
 #include <set>
 
 // Qserv headers
-#include "replica/DeleteWorkerJob.h"
+#include "replica/jobs/DeleteWorkerJob.h"
 #include "replica/Task.h"
 
 // This header declarations

diff --git a/src/replica/EventLogger.h b/src/replica/EventLogger.h
@@ -27,7 +27,7 @@
 
 // Qserv headers
 #include "replica/Controller.h"
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
 
 // Forward declarations
 namespace lsst::qserv::replica {

diff --git a/src/replica/HealthMonitorTask.h b/src/replica/HealthMonitorTask.h
@@ -28,7 +28,7 @@
 #include <set>
 
 // Qserv headers
-#include "replica/ClusterHealthJob.h"
+#include "replica/jobs/ClusterHealthJob.h"
 #include "replica/Task.h"
 #include "replica/Mutex.h"
 

diff --git a/src/replica/HttpDirectorIndexModule.cc b/src/replica/HttpDirectorIndexModule.cc
@@ -27,7 +27,7 @@
 #include "replica/config/Configuration.h"
 #include "replica/mysql/DatabaseMySQL.h"
 #include "replica/database/DatabaseServices.h"
-#include "replica/DirectorIndexJob.h"
+#include "replica/jobs/DirectorIndexJob.h"
 #include "replica/ServiceProvider.h"
 
 using namespace std;

diff --git a/src/replica/HttpIngestModule.cc b/src/replica/HttpIngestModule.cc
@@ -45,19 +45,19 @@
 #include "replica/config/Configuration.h"
 #include "replica/mysql/DatabaseMySQL.h"
 #include "replica/database/DatabaseServices.h"
-#include "replica/FindAllJob.h"
-#include "replica/QservSyncJob.h"
+#include "replica/jobs/FindAllJob.h"
+#include "replica/jobs/QservSyncJob.h"
 #include "replica/ReplicaInfo.h"
 #include "replica/ServiceProvider.h"
-#include "replica/SqlCreateDbJob.h"
-#include "replica/SqlCreateTableJob.h"
-#include "replica/SqlCreateTablesJob.h"
-#include "replica/SqlDeleteDbJob.h"
-#include "replica/SqlDeleteTableJob.h"
-#include "replica/SqlDisableDbJob.h"
-#include "replica/SqlGrantAccessJob.h"
-#include "replica/SqlEnableDbJob.h"
-#include "replica/SqlRemoveTablePartitionsJob.h"
+#include "replica/jobs/SqlCreateDbJob.h"
+#include "replica/jobs/SqlCreateTableJob.h"
+#include "replica/jobs/SqlCreateTablesJob.h"
+#include "replica/jobs/SqlDeleteDbJob.h"
+#include "replica/jobs/SqlDeleteTableJob.h"
+#include "replica/jobs/SqlDisableDbJob.h"
+#include "replica/jobs/SqlGrantAccessJob.h"
+#include "replica/jobs/SqlEnableDbJob.h"
+#include "replica/jobs/SqlRemoveTablePartitionsJob.h"
 #include "replica/SqlResultSet.h"
 
 // LSST headers

diff --git a/src/replica/HttpIngestModule.h b/src/replica/HttpIngestModule.h
@@ -31,7 +31,7 @@
 // Qserv headers
 #include "replica/Common.h"
 #include "replica/HttpModule.h"
-#include "replica/SqlRowStatsJob.h"
+#include "replica/jobs/SqlRowStatsJob.h"
 
 // Forward declarations
 namespace lsst::qserv::replica {

diff --git a/src/replica/HttpIngestTransModule.cc b/src/replica/HttpIngestTransModule.cc
@@ -33,11 +33,11 @@
 
 // Qserv headers
 #include "http/Exceptions.h"
-#include "replica/AbortTransactionJob.h"
+#include "replica/jobs/AbortTransactionJob.h"
 #include "replica/config/Configuration.h"
 #include "replica/mysql/DatabaseMySQL.h"
 #include "replica/database/DatabaseServices.h"
-#include "replica/DirectorIndexJob.h"
+#include "replica/jobs/DirectorIndexJob.h"
 #include "replica/NamedMutexRegistry.h"
 #include "replica/ServiceProvider.h"
 #include "replica/Mutex.h"

diff --git a/src/replica/HttpModule.cc b/src/replica/HttpModule.cc
@@ -30,7 +30,7 @@
 #include "replica/Controller.h"
 #include "replica/mysql/DatabaseMySQL.h"
 #include "replica/database/DatabaseServices.h"
-#include "replica/ServiceManagementJob.h"
+#include "replica/jobs/ServiceManagementJob.h"
 #include "replica/ServiceProvider.h"
 
 // LSST headers

diff --git a/src/replica/HttpQservMonitorModule.cc b/src/replica/HttpQservMonitorModule.cc
@@ -44,7 +44,7 @@
 #include "replica/config/ConfigDatabase.h"
 #include "replica/database/DatabaseServices.h"
 #include "replica/qserv/QservMgtServices.h"
-#include "replica/QservStatusJob.h"
+#include "replica/jobs/QservStatusJob.h"
 #include "replica/ServiceProvider.h"
 #include "util/String.h"
 #include "wbase/TaskState.h"

diff --git a/src/replica/HttpSqlIndexModule.cc b/src/replica/HttpSqlIndexModule.cc
@@ -32,9 +32,9 @@
 #include "http/Exceptions.h"
 #include "http/RequestBody.h"
 #include "replica/config/Configuration.h"
-#include "replica/SqlCreateIndexesJob.h"
-#include "replica/SqlDropIndexesJob.h"
-#include "replica/SqlGetIndexesJob.h"
+#include "replica/jobs/SqlCreateIndexesJob.h"
+#include "replica/jobs/SqlDropIndexesJob.h"
+#include "replica/jobs/SqlGetIndexesJob.h"
 #include "replica/SqlResultSet.h"
 
 using namespace std;

diff --git a/src/replica/HttpSqlSchemaModule.cc b/src/replica/HttpSqlSchemaModule.cc
@@ -34,7 +34,7 @@
 #include "http/Exceptions.h"
 #include "replica/config/Configuration.h"
 #include "replica/mysql/DatabaseMySQL.h"
-#include "replica/SqlAlterTablesJob.h"
+#include "replica/jobs/SqlAlterTablesJob.h"
 #include "replica/SqlResultSet.h"
 
 using namespace std;

diff --git a/src/replica/ReplicationTask.cc b/src/replica/ReplicationTask.cc
@@ -23,11 +23,11 @@
 #include "replica/ReplicationTask.h"
 
 // Qserv headers
-#include "replica/FindAllJob.h"
-#include "replica/FixUpJob.h"
-#include "replica/ReplicateJob.h"
-#include "replica/RebalanceJob.h"
-#include "replica/PurgeJob.h"
+#include "replica/jobs/FindAllJob.h"
+#include "replica/jobs/FixUpJob.h"
+#include "replica/jobs/ReplicateJob.h"
+#include "replica/jobs/RebalanceJob.h"
+#include "replica/jobs/PurgeJob.h"
 
 using namespace std;
 

diff --git a/src/replica/Task.cc b/src/replica/Task.cc
@@ -27,7 +27,7 @@
 #include <thread>
 
 // Qserv headers
-#include "replica/QservSyncJob.h"
+#include "replica/jobs/QservSyncJob.h"
 #include "replica/ServiceProvider.h"
 #include "util/BlockPost.h"
 

diff --git a/src/replica/Task.h b/src/replica/Task.h
@@ -31,7 +31,7 @@
 // Qserv headers
 #include "replica/Controller.h"
 #include "replica/EventLogger.h"
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
 #include "replica/ServiceProvider.h"
 #include "util/BlockPost.h"
 #include "util/Issue.h"

diff --git a/src/replica/apps/AbortTransactionApp.cc b/src/replica/apps/AbortTransactionApp.cc
@@ -29,9 +29,9 @@
 #include <vector>
 
 // Qserv headers
-#include "replica/AbortTransactionJob.h"
 #include "replica/config/Configuration.h"
 #include "replica/Controller.h"
+#include "replica/jobs/AbortTransactionJob.h"
 #include "replica/ServiceProvider.h"
 
 using namespace std;

diff --git a/src/replica/apps/Application.cc b/src/replica/apps/Application.cc
@@ -29,7 +29,6 @@
 #include "replica/config/Configuration.h"
 #include "replica/config/ConfigParserMySQL.h"
 #include "replica/config/ConfigurationSchema.h"
-#include "replica/Job.h"
 #include "replica/protocol.pb.h"
 #include "util/Issue.h"
 

diff --git a/src/replica/apps/ChunksApp.cc b/src/replica/apps/ChunksApp.cc
@@ -31,8 +31,8 @@
 // Qserv headers
 #include "replica/config/Configuration.h"
 #include "replica/Controller.h"
-#include "replica/FindAllJob.h"
-#include "replica/QservGetReplicasJob.h"
+#include "replica/jobs/FindAllJob.h"
+#include "replica/jobs/QservGetReplicasJob.h"
 #include "replica/ReplicaInfo.h"
 #include "util/TablePrinter.h"
 

diff --git a/src/replica/apps/ClusterHealthApp.cc b/src/replica/apps/ClusterHealthApp.cc
@@ -29,7 +29,7 @@
 
 // Qserv headers
 #include "replica/Controller.h"
-#include "replica/ClusterHealthJob.h"
+#include "replica/jobs/ClusterHealthJob.h"
 #include "util/TablePrinter.h"
 
 using namespace std;

diff --git a/src/replica/apps/DeleteWorkerApp.cc b/src/replica/apps/DeleteWorkerApp.cc
@@ -30,8 +30,8 @@
 // Qserv headers
 #include "replica/config/Configuration.h"
 #include "replica/Controller.h"
+#include "replica/jobs/DeleteWorkerJob.h"
 #include "replica/ReplicaInfo.h"
-#include "replica/DeleteWorkerJob.h"
 
 using namespace std;