Migrated more modules into the dedicated subfolders

lsst · Dec 21, 2023 · f8c5974 · f8c5974
1 parent 0dcf433
commit f8c5974
Show file tree

Hide file tree

Showing 347 changed files with 732 additions and 703 deletions.
diff --git a/src/replica/CMakeLists.txt b/src/replica/CMakeLists.txt
@@ -9,54 +9,6 @@ target_compile_options(replica PRIVATE
 target_sources(replica PRIVATE
     ${REPLICA_PB_SRCS}
     ${REPLICA_PB_HDRS}
-    ChunkLocker.cc
-    ChunkNumber.cc
-    ChunkedTable.cc
-    Common.cc
-    Controller.cc
-    Csv.cc
-    DeleteWorkerTask.cc
-    EventLogger.cc
-    ExportClient.cc
-    ExportServer.cc
-    ExportServerConnection.cc
-    FileClient.cc
-    FileServer.cc
-    FileServerConnection.cc
-    FileUtils.cc
-    HealthMonitorTask.cc
-    HttpCatalogsModule.cc
-    HttpConfigurationModule.cc
-    HttpControllersModule.cc
-    HttpDirectorIndexModule.cc
-    HttpExportModule.cc
-    HttpIngestChunksModule.cc
-    HttpIngestConfigModule.cc
-    HttpIngestModule.cc
-    HttpIngestTransModule.cc
-    HttpJobsModule.cc
-    HttpModule.cc
-    HttpProcessor.cc
-    HttpQservMonitorModule.cc
-    HttpQservSqlModule.cc
-    HttpReplicationLevelsModule.cc
-    HttpRequestsModule.cc
-    HttpSqlIndexModule.cc
-    HttpSqlSchemaModule.cc
-    HttpSvc.cc
-    HttpWorkerStatusModule.cc
-    Mutex.cc
-    NamedMutexRegistry.cc
-    Performance.cc
-    ProtocolBuffer.cc
-    ReplicaInfo.cc
-    ReplicationTask.cc
-    ServiceProvider.cc
-    SqlResultSet.cc
-    SqlSchemaUtils.cc
-    SuccessRateGenerator.cc
-    Task.cc
-    XrdCmsgetVnId.cc
 )
 
 target_include_directories(replica PRIVATE
@@ -66,13 +18,16 @@ target_include_directories(replica PRIVATE
 target_link_libraries(replica PUBLIC
     replica_apps
     replica_config
-    replica_database
+    replica_contr
+    replica_export
     replica_ingest
     replica_jobs
     replica_mysql
     replica_qserv
     replica_registry
     replica_requests
+    replica_services
+    replica_util
     replica_worker
     qserv_css
     xrdreq
@@ -162,11 +117,14 @@ replica_tests(
 
 add_subdirectory(apps)
 add_subdirectory(config)
-add_subdirectory(database)
+add_subdirectory(contr)
+add_subdirectory(export)
 add_subdirectory(ingest)
 add_subdirectory(jobs)
 add_subdirectory(mysql)
 add_subdirectory(qserv)
 add_subdirectory(registry)
 add_subdirectory(requests)
+add_subdirectory(services)
+add_subdirectory(util)
 add_subdirectory(worker)
diff --git a/src/replica/apps/AbortTransactionApp.cc b/src/replica/apps/AbortTransactionApp.cc
@@ -30,9 +30,9 @@
 
 // Qserv headers
 #include "replica/config/Configuration.h"
-#include "replica/Controller.h"
+#include "replica/contr/Controller.h"
 #include "replica/jobs/AbortTransactionJob.h"
-#include "replica/ServiceProvider.h"
+#include "replica/services/ServiceProvider.h"
 
 using namespace std;
 

diff --git a/src/replica/apps/AbortTransactionApp.h b/src/replica/apps/AbortTransactionApp.h
@@ -26,7 +26,7 @@
 
 // Qserv headers
 #include "replica/apps/Application.h"
-#include "replica/Common.h"
+#include "replica/util/Common.h"
 
 // This header declarations
 namespace lsst::qserv::replica {

diff --git a/src/replica/apps/AdminApp.cc b/src/replica/apps/AdminApp.cc
@@ -29,9 +29,9 @@
 #include <vector>
 
 // Qserv headers
-#include "replica/Controller.h"
-#include "replica/Performance.h"
+#include "replica/contr/Controller.h"
 #include "replica/requests/RequestTracker.h"
+#include "replica/util/Performance.h"
 #include "replica/requests/ServiceManagementRequest.h"
 #include "util/TablePrinter.h"
 #include "util/TimeUtils.h"

diff --git a/src/replica/apps/AdminApp.h b/src/replica/apps/AdminApp.h
@@ -27,7 +27,7 @@
 
 // Qserv headers
 #include "replica/apps/Application.h"
-#include "replica/Common.h"
+#include "replica/util/Common.h"
 
 // This header declarations
 namespace lsst::qserv::replica {

diff --git a/src/replica/apps/Application.h b/src/replica/apps/Application.h
@@ -29,7 +29,7 @@
 
 // Qserv headers
 #include "replica/apps/ApplicationTypes.h"
-#include "replica/ServiceProvider.h"
+#include "replica/services/ServiceProvider.h"
 
 // This header declarations
 namespace lsst::qserv::replica {

diff --git a/src/replica/apps/ApplicationTypes.h b/src/replica/apps/ApplicationTypes.h
@@ -39,7 +39,7 @@
 #include "boost/lexical_cast.hpp"
 
 // Qserv headers
-#include "replica/Common.h"
+#include "replica/util/Common.h"
 #include "util/Issue.h"
 
 // Forward declarations

diff --git a/src/replica/apps/CheckSumApp.cc b/src/replica/apps/CheckSumApp.cc
@@ -26,7 +26,7 @@
 #include <iostream>
 
 // Qserv headers
-#include "replica/FileUtils.h"
+#include "replica/util/FileUtils.h"
 
 using namespace std;
 

diff --git a/src/replica/apps/ChunksApp.cc b/src/replica/apps/ChunksApp.cc
@@ -30,10 +30,10 @@
 
 // Qserv headers
 #include "replica/config/Configuration.h"
-#include "replica/Controller.h"
+#include "replica/contr/Controller.h"
 #include "replica/jobs/FindAllJob.h"
 #include "replica/jobs/QservGetReplicasJob.h"
-#include "replica/ReplicaInfo.h"
+#include "replica/util/ReplicaInfo.h"
 #include "util/TablePrinter.h"
 
 using namespace std;

diff --git a/src/replica/apps/ClusterHealthApp.cc b/src/replica/apps/ClusterHealthApp.cc
@@ -28,7 +28,7 @@
 #include <vector>
 
 // Qserv headers
-#include "replica/Controller.h"
+#include "replica/contr/Controller.h"
 #include "replica/jobs/ClusterHealthJob.h"
 #include "util/TablePrinter.h"
 

diff --git a/src/replica/apps/ConfigApp.cc b/src/replica/apps/ConfigApp.cc
@@ -32,8 +32,8 @@
 #include "nlohmann/json.hpp"
 
 // Qserv headers
-#include "replica/Common.h"
 #include "replica/config/Configuration.h"
+#include "replica/util/Common.h"
 #include "util/TablePrinter.h"
 
 // LSST headers

diff --git a/src/replica/apps/ConfigAppBase.cc b/src/replica/apps/ConfigAppBase.cc
@@ -27,7 +27,7 @@
 #include <vector>
 
 // Qserv headers
-#include "replica/Common.h"
+#include "replica/util/Common.h"
 #include "util/TablePrinter.h"
 
 using namespace std;

diff --git a/src/replica/apps/ConfigTestApp.cc b/src/replica/apps/ConfigTestApp.cc
@@ -33,8 +33,8 @@
 #include "boost/asio.hpp"
 
 // Qserv headers
-#include "replica/Common.h"
 #include "replica/config/Configuration.h"
+#include "replica/util/Common.h"
 #include "util/TablePrinter.h"
 
 using namespace std;

diff --git a/src/replica/apps/ControllerApp.cc b/src/replica/apps/ControllerApp.cc
@@ -28,7 +28,6 @@
 #include <stdexcept>
 
 // Qserv headers
-#include "replica/ChunkedTable.h"
 #include "replica/requests/DeleteRequest.h"
 #include "replica/requests/DisposeRequest.h"
 #include "replica/requests/EchoRequest.h"
@@ -37,7 +36,6 @@
 #include "replica/requests/DirectorIndexRequest.h"
 #include "replica/requests/ReplicationRequest.h"
 #include "replica/requests/ServiceManagementRequest.h"
-#include "replica/ServiceProvider.h"
 #include "replica/requests/SqlAlterTablesRequest.h"
 #include "replica/requests/SqlCreateDbRequest.h"
 #include "replica/requests/SqlCreateIndexesRequest.h"
@@ -54,9 +52,11 @@
 #include "replica/requests/SqlQueryRequest.h"
 #include "replica/requests/SqlRemoveTablePartitionsRequest.h"
 #include "replica/requests/SqlRowStatsRequest.h"
-#include "replica/SqlSchemaUtils.h"
 #include "replica/requests/StatusRequest.h"
 #include "replica/requests/StopRequest.h"
+#include "replica/services/ServiceProvider.h"
+#include "replica/util/ChunkedTable.h"
+#include "replica/util/SqlSchemaUtils.h"
 #include "util/BlockPost.h"
 
 using namespace std;

diff --git a/src/replica/apps/ControllerApp.h b/src/replica/apps/ControllerApp.h
@@ -28,9 +28,9 @@
 
 // Qserv headers
 #include "replica/apps/Application.h"
-#include "replica/Common.h"
-#include "replica/Controller.h"
+#include "replica/contr/Controller.h"
 #include "replica/requests/Request.h"
+#include "replica/util/Common.h"
 
 // This header declarations
 namespace lsst::qserv::replica {

diff --git a/src/replica/apps/DatabaseTestApp.cc b/src/replica/apps/DatabaseTestApp.cc
@@ -34,8 +34,8 @@
 
 // Qserv headers
 #include "replica/config/Configuration.h"
-#include "replica/database/DatabaseServices.h"
-#include "replica/ReplicaInfo.h"
+#include "replica/services/DatabaseServices.h"
+#include "replica/util/ReplicaInfo.h"
 #include "util/TablePrinter.h"
 
 using namespace std;

diff --git a/src/replica/apps/DatabaseTestApp.h b/src/replica/apps/DatabaseTestApp.h
@@ -23,7 +23,7 @@
 
 // Qserv headers
 #include "replica/apps/Application.h"
-#include "replica/Common.h"
+#include "replica/util/Common.h"
 
 // Forward declaratons
 namespace lsst::qserv::replica {

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

diff --git a/src/replica/apps/DirectorIndexApp.cc b/src/replica/apps/DirectorIndexApp.cc
@@ -30,7 +30,7 @@
 
 // Qserv headers
 #include "replica/config/Configuration.h"
-#include "replica/Controller.h"
+#include "replica/contr/Controller.h"
 #include "replica/jobs/DirectorIndexJob.h"
 #include "util/TablePrinter.h"
 

diff --git a/src/replica/apps/DirectorIndexApp.h b/src/replica/apps/DirectorIndexApp.h
@@ -27,7 +27,7 @@
 
 // Qserv headers
 #include "replica/apps/Application.h"
-#include "replica/Common.h"
+#include "replica/util/Common.h"
 
 // This header declarations
 namespace lsst::qserv::replica {

diff --git a/src/replica/apps/FileExportApp.cc b/src/replica/apps/FileExportApp.cc
@@ -32,7 +32,7 @@
 #include <stdexcept>
 
 // Qserv headers
-#include "replica/ExportClient.h"
+#include "replica/export/ExportClient.h"
 #include "util/File.h"
 #include "util/TimeUtils.h"
 

diff --git a/src/replica/apps/FileExportApp.h b/src/replica/apps/FileExportApp.h
@@ -31,7 +31,7 @@
 
 // Qserv headers
 #include "replica/apps/Application.h"
-#include "replica/Common.h"
+#include "replica/util/Common.h"
 
 // This header declarations
 

diff --git a/src/replica/apps/FileIngestApp.h b/src/replica/apps/FileIngestApp.h
@@ -31,8 +31,8 @@
 
 // Qserv headers
 #include "replica/apps/Application.h"
-#include "replica/Csv.h"
 #include "replica/ingest/IngestClient.h"
+#include "replica/util/Csv.h"
 
 // This header declarations
 namespace lsst::qserv::replica {

diff --git a/src/replica/apps/FileReadApp.cc b/src/replica/apps/FileReadApp.cc
@@ -30,7 +30,7 @@
 #include <stdexcept>
 
 // Qserv headers
-#include "replica/FileClient.h"
+#include "replica/worker/FileClient.h"
 
 using namespace std;
 

diff --git a/src/replica/apps/FileServerApp.cc b/src/replica/apps/FileServerApp.cc
@@ -26,7 +26,7 @@
 #include <thread>
 
 // Qserv headers
-#include "replica/FileServer.h"
+#include "replica/worker/FileServer.h"
 #include "util/BlockPost.h"
 
 using namespace std;

diff --git a/src/replica/apps/FixUpApp.cc b/src/replica/apps/FixUpApp.cc
@@ -29,9 +29,9 @@
 
 // Qserv headers
 #include "replica/config/Configuration.h"
-#include "replica/Controller.h"
+#include "replica/contr/Controller.h"
 #include "replica/jobs/FixUpJob.h"
-#include "replica/ReplicaInfo.h"
+#include "replica/util/ReplicaInfo.h"
 
 using namespace std;
 

diff --git a/src/replica/apps/MasterControllerHttpApp.cc b/src/replica/apps/MasterControllerHttpApp.cc
@@ -29,9 +29,9 @@
 #include <thread>
 
 // Qserv headers
-#include "replica/database/DatabaseServices.h"
-#include "replica/HttpProcessor.h"
-#include "replica/HttpProcessorConfig.h"
+#include "replica/contr/HttpProcessor.h"
+#include "replica/contr/HttpProcessorConfig.h"
+#include "replica/services/DatabaseServices.h"
 #include "util/TimeUtils.h"
 
 // LSST headers

diff --git a/src/replica/apps/MasterControllerHttpApp.h b/src/replica/apps/MasterControllerHttpApp.h
@@ -26,11 +26,11 @@
 
 // Qserv headers
 #include "replica/apps/Application.h"
-#include "replica/Controller.h"
-#include "replica/DeleteWorkerTask.h"
-#include "replica/HealthMonitorTask.h"
-#include "replica/OneWayFailer.h"
-#include "replica/ReplicationTask.h"
+#include "replica/contr/Controller.h"
+#include "replica/contr/DeleteWorkerTask.h"
+#include "replica/contr/HealthMonitorTask.h"
+#include "replica/contr/ReplicationTask.h"
+#include "replica/util/OneWayFailer.h"
 
 // This header declarations
 namespace lsst::qserv::replica {

diff --git a/src/replica/apps/MessengerTestApp.cc b/src/replica/apps/MessengerTestApp.cc
@@ -29,9 +29,9 @@
 
 // Qserv headers
 #include "replica/config/Configuration.h"
-#include "replica/Controller.h"
+#include "replica/contr/Controller.h"
 #include "replica/requests/EchoRequest.h"
-#include "replica/ServiceProvider.h"
+#include "replica/services/ServiceProvider.h"
 #include "util/BlockPost.h"
 #include "util/TimeUtils.h"