From de5150cb4c3549e550df4bf83a171b0a6e3d38d7 Mon Sep 17 00:00:00 2001 From: Igor Gaponenko Date: Wed, 20 Dec 2023 22:30:14 +0000 Subject: [PATCH] Migrated more modules into the dedicated subfolders --- src/replica/CMakeLists.txt | 9 ++++----- src/replica/apps/FileExportApp.cc | 2 +- src/replica/apps/FileIngestApp.h | 2 +- src/replica/apps/WorkerApp.cc | 2 +- src/replica/database/DatabaseServices.h | 2 +- src/replica/database/TransactionContrib.h | 2 +- src/replica/export/CMakeLists.txt | 9 +++++++++ src/replica/{ => export}/ExportClient.cc | 2 +- src/replica/{ => export}/ExportClient.h | 0 src/replica/{ => export}/ExportServer.cc | 2 +- src/replica/{ => export}/ExportServer.h | 2 +- src/replica/{ => export}/ExportServerConnection.cc | 2 +- src/replica/{ => export}/ExportServerConnection.h | 2 +- src/replica/ingest/IngestClient.h | 2 +- src/replica/ingest/IngestFileSvc.h | 2 +- src/replica/ingest/IngestHttpSvcMod.cc | 2 +- src/replica/ingest/IngestRequest.h | 2 +- src/replica/ingest/IngestSvcConn.h | 2 +- src/replica/mysql/DatabaseMySQLGenerator.h | 2 +- src/replica/qserv/CMakeLists.txt | 4 ++++ src/replica/{ => qserv}/XrdCmsgetVnId.cc | 0 src/replica/tests/testCsv.cc | 2 +- src/replica/util/CMakeLists.txt | 7 +++++++ src/replica/{ => util}/Csv.cc | 2 +- src/replica/{ => util}/Csv.h | 0 25 files changed, 42 insertions(+), 23 deletions(-) create mode 100644 src/replica/export/CMakeLists.txt rename src/replica/{ => export}/ExportClient.cc (99%) rename src/replica/{ => export}/ExportClient.h (100%) rename src/replica/{ => export}/ExportServer.cc (98%) rename src/replica/{ => export}/ExportServer.h (98%) rename src/replica/{ => export}/ExportServerConnection.cc (99%) rename src/replica/{ => export}/ExportServerConnection.h (99%) rename src/replica/{ => qserv}/XrdCmsgetVnId.cc (100%) create mode 100644 src/replica/util/CMakeLists.txt rename src/replica/{ => util}/Csv.cc (99%) rename src/replica/{ => util}/Csv.h (100%) diff --git a/src/replica/CMakeLists.txt b/src/replica/CMakeLists.txt index fd2452e48f..488b52e978 100644 --- a/src/replica/CMakeLists.txt +++ b/src/replica/CMakeLists.txt @@ -14,12 +14,8 @@ target_sources(replica PRIVATE ChunkedTable.cc Common.cc Controller.cc - Csv.cc DeleteWorkerTask.cc EventLogger.cc - ExportClient.cc - ExportServer.cc - ExportServerConnection.cc FileClient.cc FileServer.cc FileServerConnection.cc @@ -56,7 +52,6 @@ target_sources(replica PRIVATE SqlSchemaUtils.cc SuccessRateGenerator.cc Task.cc - XrdCmsgetVnId.cc ) target_include_directories(replica PRIVATE @@ -67,12 +62,14 @@ target_link_libraries(replica PUBLIC replica_apps replica_config replica_database + replica_export replica_ingest replica_jobs replica_mysql replica_qserv replica_registry replica_requests + replica_util replica_worker qserv_css xrdreq @@ -163,10 +160,12 @@ replica_tests( add_subdirectory(apps) add_subdirectory(config) add_subdirectory(database) +add_subdirectory(export) add_subdirectory(ingest) add_subdirectory(jobs) add_subdirectory(mysql) add_subdirectory(qserv) add_subdirectory(registry) add_subdirectory(requests) +add_subdirectory(util) add_subdirectory(worker) diff --git a/src/replica/apps/FileExportApp.cc b/src/replica/apps/FileExportApp.cc index 6722a309b6..987fa1e724 100644 --- a/src/replica/apps/FileExportApp.cc +++ b/src/replica/apps/FileExportApp.cc @@ -32,7 +32,7 @@ #include // 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/FileIngestApp.h b/src/replica/apps/FileIngestApp.h index ada7debc0c..b76c6cecef 100644 --- a/src/replica/apps/FileIngestApp.h +++ b/src/replica/apps/FileIngestApp.h @@ -31,7 +31,7 @@ // Qserv headers #include "replica/apps/Application.h" -#include "replica/Csv.h" +#include "replica/util/Csv.h" #include "replica/ingest/IngestClient.h" // This header declarations diff --git a/src/replica/apps/WorkerApp.cc b/src/replica/apps/WorkerApp.cc index f49c92de63..f719db3877 100644 --- a/src/replica/apps/WorkerApp.cc +++ b/src/replica/apps/WorkerApp.cc @@ -32,7 +32,7 @@ #include "replica/config/Configuration.h" #include "replica/mysql/DatabaseMySQL.h" #include "replica/mysql/DatabaseMySQLUtils.h" -#include "replica/ExportServer.h" +#include "replica/export/ExportServer.h" #include "replica/FileServer.h" #include "replica/FileUtils.h" #include "replica/ingest/IngestHttpSvc.h" diff --git a/src/replica/database/DatabaseServices.h b/src/replica/database/DatabaseServices.h index 79eee02c4c..6aae276a0b 100644 --- a/src/replica/database/DatabaseServices.h +++ b/src/replica/database/DatabaseServices.h @@ -37,7 +37,7 @@ // Qserv headers #include "replica/Common.h" -#include "replica/Csv.h" +#include "replica/util/Csv.h" #include "replica/database/TransactionContrib.h" #include "replica/ReplicaInfo.h" #include "replica/Mutex.h" diff --git a/src/replica/database/TransactionContrib.h b/src/replica/database/TransactionContrib.h index 387ed2c208..b3701ac008 100644 --- a/src/replica/database/TransactionContrib.h +++ b/src/replica/database/TransactionContrib.h @@ -35,7 +35,7 @@ // Qserv headers #include "http/Method.h" #include "replica/Common.h" -#include "replica/Csv.h" +#include "replica/util/Csv.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/export/CMakeLists.txt b/src/replica/export/CMakeLists.txt new file mode 100644 index 0000000000..d7f7ba122e --- /dev/null +++ b/src/replica/export/CMakeLists.txt @@ -0,0 +1,9 @@ +add_library(replica_export OBJECT) +target_sources(replica_export PRIVATE + ExportClient.cc + ExportServer.cc + ExportServerConnection.cc +) +target_link_libraries(replica_export PUBLIC + log +) diff --git a/src/replica/ExportClient.cc b/src/replica/export/ExportClient.cc similarity index 99% rename from src/replica/ExportClient.cc rename to src/replica/export/ExportClient.cc index 7abe94483c..c8704ce37e 100644 --- a/src/replica/ExportClient.cc +++ b/src/replica/export/ExportClient.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/ExportClient.h" +#include "replica/export/ExportClient.h" // System headers #include diff --git a/src/replica/ExportClient.h b/src/replica/export/ExportClient.h similarity index 100% rename from src/replica/ExportClient.h rename to src/replica/export/ExportClient.h diff --git a/src/replica/ExportServer.cc b/src/replica/export/ExportServer.cc similarity index 98% rename from src/replica/ExportServer.cc rename to src/replica/export/ExportServer.cc index 6586787ea7..98c6b274c1 100644 --- a/src/replica/ExportServer.cc +++ b/src/replica/export/ExportServer.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/ExportServer.h" +#include "replica/export/ExportServer.h" // System headers #include diff --git a/src/replica/ExportServer.h b/src/replica/export/ExportServer.h similarity index 98% rename from src/replica/ExportServer.h rename to src/replica/export/ExportServer.h index be4e7bd335..0370842f01 100644 --- a/src/replica/ExportServer.h +++ b/src/replica/export/ExportServer.h @@ -33,7 +33,7 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/ExportServerConnection.h" +#include "replica/export/ExportServerConnection.h" #include "replica/ServiceProvider.h" // This header declarations diff --git a/src/replica/ExportServerConnection.cc b/src/replica/export/ExportServerConnection.cc similarity index 99% rename from src/replica/ExportServerConnection.cc rename to src/replica/export/ExportServerConnection.cc index e681837cd2..70ade92a2c 100644 --- a/src/replica/ExportServerConnection.cc +++ b/src/replica/export/ExportServerConnection.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/ExportServerConnection.h" +#include "replica/export/ExportServerConnection.h" // System headers #include diff --git a/src/replica/ExportServerConnection.h b/src/replica/export/ExportServerConnection.h similarity index 99% rename from src/replica/ExportServerConnection.h rename to src/replica/export/ExportServerConnection.h index f577de2c76..4faa809f8e 100644 --- a/src/replica/ExportServerConnection.h +++ b/src/replica/export/ExportServerConnection.h @@ -30,7 +30,7 @@ // Qserv headers #include "replica/Common.h" -#include "replica/Csv.h" +#include "replica/util/Csv.h" #include "replica/config/Configuration.h" #include "replica/protocol.pb.h" #include "replica/ProtocolBuffer.h" diff --git a/src/replica/ingest/IngestClient.h b/src/replica/ingest/IngestClient.h index d01db24191..78efb08af7 100644 --- a/src/replica/ingest/IngestClient.h +++ b/src/replica/ingest/IngestClient.h @@ -31,7 +31,7 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/Csv.h" +#include "replica/util/Csv.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/ingest/IngestFileSvc.h b/src/replica/ingest/IngestFileSvc.h index 9d09a89a17..eb79d9aaa7 100644 --- a/src/replica/ingest/IngestFileSvc.h +++ b/src/replica/ingest/IngestFileSvc.h @@ -28,7 +28,7 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/Csv.h" +#include "replica/util/Csv.h" #include "replica/database/TransactionContrib.h" #include "replica/ServiceProvider.h" diff --git a/src/replica/ingest/IngestHttpSvcMod.cc b/src/replica/ingest/IngestHttpSvcMod.cc index 0b5ec0be0b..154ad29790 100644 --- a/src/replica/ingest/IngestHttpSvcMod.cc +++ b/src/replica/ingest/IngestHttpSvcMod.cc @@ -24,7 +24,7 @@ // Qserv header #include "http/Method.h" -#include "replica/Csv.h" +#include "replica/util/Csv.h" // System headers #include diff --git a/src/replica/ingest/IngestRequest.h b/src/replica/ingest/IngestRequest.h index 636eab5390..54edc6a071 100644 --- a/src/replica/ingest/IngestRequest.h +++ b/src/replica/ingest/IngestRequest.h @@ -31,7 +31,7 @@ // Qserv headers #include "http/Method.h" #include "http/Url.h" -#include "replica/Csv.h" +#include "replica/util/Csv.h" #include "replica/database/DatabaseServices.h" #include "replica/ingest/IngestFileSvc.h" #include "replica/Mutex.h" diff --git a/src/replica/ingest/IngestSvcConn.h b/src/replica/ingest/IngestSvcConn.h index e9abda6fbe..930d068013 100644 --- a/src/replica/ingest/IngestSvcConn.h +++ b/src/replica/ingest/IngestSvcConn.h @@ -28,7 +28,7 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/Csv.h" +#include "replica/util/Csv.h" #include "replica/database/DatabaseServices.h" #include "replica/ingest/IngestFileSvc.h" #include "replica/protocol.pb.h" diff --git a/src/replica/mysql/DatabaseMySQLGenerator.h b/src/replica/mysql/DatabaseMySQLGenerator.h index 30bbee33e2..f46ebc2862 100644 --- a/src/replica/mysql/DatabaseMySQLGenerator.h +++ b/src/replica/mysql/DatabaseMySQLGenerator.h @@ -29,7 +29,7 @@ // Qserv headers #include "replica/Common.h" -#include "replica/Csv.h" +#include "replica/util/Csv.h" // Forward declarations namespace lsst::qserv::replica::database::mysql { diff --git a/src/replica/qserv/CMakeLists.txt b/src/replica/qserv/CMakeLists.txt index 5bd2fdeaf7..3485c46a0c 100644 --- a/src/replica/qserv/CMakeLists.txt +++ b/src/replica/qserv/CMakeLists.txt @@ -1,4 +1,7 @@ add_library(replica_qserv OBJECT) +target_include_directories(replica_qserv PRIVATE + ${XROOTD_INCLUDE_DIRS} +) target_sources(replica_qserv PRIVATE AddReplicaQservMgtRequest.cc GetReplicasQservMgtRequest.cc @@ -16,6 +19,7 @@ target_sources(replica_qserv PRIVATE RemoveReplicaQservMgtRequest.cc SetReplicasQservMgtRequest.cc TestEchoQservMgtRequest.cc + XrdCmsgetVnId.cc ) target_link_libraries(replica_qserv PUBLIC log diff --git a/src/replica/XrdCmsgetVnId.cc b/src/replica/qserv/XrdCmsgetVnId.cc similarity index 100% rename from src/replica/XrdCmsgetVnId.cc rename to src/replica/qserv/XrdCmsgetVnId.cc diff --git a/src/replica/tests/testCsv.cc b/src/replica/tests/testCsv.cc index 0ff1954f49..d00a53f51a 100644 --- a/src/replica/tests/testCsv.cc +++ b/src/replica/tests/testCsv.cc @@ -33,7 +33,7 @@ #include // Qserv headers -#include "replica/Csv.h" +#include "replica/util/Csv.h" #include "replica/protocol.pb.h" // Boost unit test header diff --git a/src/replica/util/CMakeLists.txt b/src/replica/util/CMakeLists.txt new file mode 100644 index 0000000000..4d6c8372be --- /dev/null +++ b/src/replica/util/CMakeLists.txt @@ -0,0 +1,7 @@ +add_library(replica_util OBJECT) +target_sources(replica_util PRIVATE + Csv.cc +) +target_link_libraries(replica_util PUBLIC + log +) diff --git a/src/replica/Csv.cc b/src/replica/util/Csv.cc similarity index 99% rename from src/replica/Csv.cc rename to src/replica/util/Csv.cc index 492212af94..39b878deaa 100644 --- a/src/replica/Csv.cc +++ b/src/replica/util/Csv.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/Csv.h" +#include "replica/util/Csv.h" // System headers #include diff --git a/src/replica/Csv.h b/src/replica/util/Csv.h similarity index 100% rename from src/replica/Csv.h rename to src/replica/util/Csv.h