Migrated more modules into the dedicated subfolders

lsst · Dec 20, 2023 · de5150c · de5150c
1 parent 0dcf433
commit de5150c
Show file tree

Hide file tree

Showing 25 changed files with 42 additions and 23 deletions.
diff --git 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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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 → src/replica/export/ExportClient.cc b/src/replica/ExportClient.cc → src/replica/export/ExportClient.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/ExportClient.h"
+#include "replica/export/ExportClient.h"
 
 // System headers
 #include <algorithm>

diff --git a/src/replica/ExportClient.h → src/replica/export/ExportClient.h b/src/replica/ExportClient.h → src/replica/export/ExportClient.h
diff --git a/src/replica/ExportServer.cc → src/replica/export/ExportServer.cc b/src/replica/ExportServer.cc → src/replica/export/ExportServer.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/ExportServer.h"
+#include "replica/export/ExportServer.h"
 
 // System headers
 #include <functional>

diff --git a/src/replica/ExportServer.h → src/replica/export/ExportServer.h b/src/replica/ExportServer.h → 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 → src/replica/export/ExportServerConnection.cc b/src/replica/ExportServerConnection.cc → src/replica/export/ExportServerConnection.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/ExportServerConnection.h"
+#include "replica/export/ExportServerConnection.h"
 
 // System headers
 #include <algorithm>

diff --git a/src/replica/ExportServerConnection.h → src/replica/export/ExportServerConnection.h b/src/replica/ExportServerConnection.h → 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
@@ -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
@@ -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
@@ -24,7 +24,7 @@
 
 // Qserv header
 #include "http/Method.h"
-#include "replica/Csv.h"
+#include "replica/util/Csv.h"
 
 // System headers
 #include <algorithm>

diff --git 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
@@ -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
@@ -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
@@ -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 → src/replica/qserv/XrdCmsgetVnId.cc b/src/replica/XrdCmsgetVnId.cc → src/replica/qserv/XrdCmsgetVnId.cc
diff --git a/src/replica/tests/testCsv.cc b/src/replica/tests/testCsv.cc
@@ -33,7 +33,7 @@
 #include <vector>
 
 // 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
@@ -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 → src/replica/util/Csv.cc b/src/replica/Csv.cc → src/replica/util/Csv.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/Csv.h"
+#include "replica/util/Csv.h"
 
 // System headers
 #include <algorithm>

diff --git a/src/replica/Csv.h → src/replica/util/Csv.h b/src/replica/Csv.h → src/replica/util/Csv.h