From f8c597483e6678e292b372c37ca104cb26dce12c 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 | 58 +++---------------- src/replica/apps/AbortTransactionApp.cc | 4 +- src/replica/apps/AbortTransactionApp.h | 2 +- src/replica/apps/AdminApp.cc | 4 +- src/replica/apps/AdminApp.h | 2 +- src/replica/apps/Application.h | 2 +- src/replica/apps/ApplicationTypes.h | 2 +- src/replica/apps/CheckSumApp.cc | 2 +- src/replica/apps/ChunksApp.cc | 4 +- src/replica/apps/ClusterHealthApp.cc | 2 +- src/replica/apps/ConfigApp.cc | 2 +- src/replica/apps/ConfigAppBase.cc | 2 +- src/replica/apps/ConfigTestApp.cc | 2 +- src/replica/apps/ControllerApp.cc | 6 +- src/replica/apps/ControllerApp.h | 4 +- src/replica/apps/DatabaseTestApp.cc | 4 +- src/replica/apps/DatabaseTestApp.h | 2 +- src/replica/apps/DeleteWorkerApp.cc | 4 +- src/replica/apps/DirectorIndexApp.cc | 2 +- src/replica/apps/DirectorIndexApp.h | 2 +- src/replica/apps/FileExportApp.cc | 2 +- src/replica/apps/FileExportApp.h | 2 +- src/replica/apps/FileIngestApp.h | 2 +- src/replica/apps/FileReadApp.cc | 2 +- src/replica/apps/FileServerApp.cc | 2 +- src/replica/apps/FixUpApp.cc | 4 +- src/replica/apps/MasterControllerHttpApp.cc | 6 +- src/replica/apps/MasterControllerHttpApp.h | 10 ++-- src/replica/apps/MessengerTestApp.cc | 4 +- src/replica/apps/MoveApp.cc | 4 +- src/replica/apps/PurgeApp.cc | 4 +- src/replica/apps/QservWorkerApp.h | 2 +- src/replica/apps/QservWorkerPingApp.cc | 2 +- src/replica/apps/RebalanceApp.cc | 4 +- src/replica/apps/ReplicateApp.cc | 4 +- src/replica/apps/SqlApp.cc | 6 +- src/replica/apps/SqlApp.h | 2 +- src/replica/apps/SyncApp.cc | 2 +- src/replica/apps/TransactionsApp.cc | 8 +-- src/replica/apps/TransactionsApp.h | 2 +- src/replica/apps/VerifyApp.cc | 4 +- src/replica/apps/WorkerApp.cc | 12 ++-- src/replica/config/ConfigDatabase.cc | 2 +- src/replica/config/ConfigDatabase.h | 2 +- src/replica/config/ConfigDatabaseFamily.cc | 2 +- src/replica/config/ConfigTable.cc | 2 +- src/replica/config/ConfigTable.h | 2 +- src/replica/config/Configuration.cc | 2 +- src/replica/config/Configuration.h | 4 +- src/replica/config/ConfigurationSchema.cc | 4 +- src/replica/contr/CMakeLists.txt | 32 ++++++++++ src/replica/{ => contr}/Controller.cc | 14 ++--- src/replica/{ => contr}/Controller.h | 6 +- src/replica/{ => contr}/DeleteWorkerTask.cc | 4 +- src/replica/{ => contr}/DeleteWorkerTask.h | 2 +- src/replica/{ => contr}/EventLogger.cc | 6 +- src/replica/{ => contr}/EventLogger.h | 2 +- src/replica/{ => contr}/HealthMonitorTask.cc | 4 +- src/replica/{ => contr}/HealthMonitorTask.h | 4 +- src/replica/{ => contr}/HttpCatalogsModule.cc | 8 +-- src/replica/{ => contr}/HttpCatalogsModule.h | 4 +- .../{ => contr}/HttpConfigurationModule.cc | 6 +- .../{ => contr}/HttpConfigurationModule.h | 2 +- .../{ => contr}/HttpControllersModule.cc | 6 +- .../{ => contr}/HttpControllersModule.h | 2 +- .../{ => contr}/HttpDirectorIndexModule.cc | 8 +-- .../{ => contr}/HttpDirectorIndexModule.h | 4 +- src/replica/{ => contr}/HttpExportModule.cc | 10 ++-- src/replica/{ => contr}/HttpExportModule.h | 4 +- .../{ => contr}/HttpIngestChunksModule.cc | 10 ++-- .../{ => contr}/HttpIngestChunksModule.h | 6 +- .../{ => contr}/HttpIngestConfigModule.cc | 4 +- .../{ => contr}/HttpIngestConfigModule.h | 4 +- src/replica/{ => contr}/HttpIngestModule.cc | 12 ++-- src/replica/{ => contr}/HttpIngestModule.h | 4 +- .../{ => contr}/HttpIngestTransModule.cc | 14 ++--- .../{ => contr}/HttpIngestTransModule.h | 4 +- src/replica/{ => contr}/HttpJobsModule.cc | 6 +- src/replica/{ => contr}/HttpJobsModule.h | 2 +- src/replica/{ => contr}/HttpModule.cc | 10 ++-- src/replica/{ => contr}/HttpModule.h | 4 +- src/replica/{ => contr}/HttpProcessor.cc | 38 ++++++------ src/replica/{ => contr}/HttpProcessor.h | 12 ++-- src/replica/{ => contr}/HttpProcessorConfig.h | 0 .../{ => contr}/HttpQservMonitorModule.cc | 15 +++-- .../{ => contr}/HttpQservMonitorModule.h | 2 +- src/replica/{ => contr}/HttpQservSqlModule.cc | 2 +- src/replica/{ => contr}/HttpQservSqlModule.h | 2 +- .../HttpReplicationLevelsModule.cc | 8 +-- .../{ => contr}/HttpReplicationLevelsModule.h | 6 +- src/replica/{ => contr}/HttpRequestsModule.cc | 6 +- src/replica/{ => contr}/HttpRequestsModule.h | 2 +- src/replica/{ => contr}/HttpSqlIndexModule.cc | 4 +- src/replica/{ => contr}/HttpSqlIndexModule.h | 4 +- .../{ => contr}/HttpSqlSchemaModule.cc | 6 +- src/replica/{ => contr}/HttpSqlSchemaModule.h | 4 +- .../{ => contr}/HttpWorkerStatusModule.cc | 6 +- .../{ => contr}/HttpWorkerStatusModule.h | 4 +- src/replica/{ => contr}/ReplicationTask.cc | 2 +- src/replica/{ => contr}/ReplicationTask.h | 2 +- src/replica/{ => contr}/Task.cc | 4 +- src/replica/{ => contr}/Task.h | 8 +-- src/replica/database/CMakeLists.txt | 10 ---- src/replica/export/CMakeLists.txt | 9 +++ src/replica/{ => export}/ExportClient.cc | 2 +- src/replica/{ => export}/ExportClient.h | 4 +- src/replica/{ => export}/ExportServer.cc | 4 +- src/replica/{ => export}/ExportServer.h | 4 +- .../{ => export}/ExportServerConnection.cc | 12 ++-- .../{ => export}/ExportServerConnection.h | 8 +-- src/replica/ingest/CMakeLists.txt | 1 + src/replica/ingest/IngestClient.cc | 2 +- src/replica/ingest/IngestClient.h | 2 +- src/replica/ingest/IngestFileSvc.cc | 10 ++-- src/replica/ingest/IngestFileSvc.h | 6 +- src/replica/ingest/IngestHttpSvc.h | 4 +- src/replica/ingest/IngestHttpSvcMod.cc | 2 +- src/replica/ingest/IngestHttpSvcMod.h | 2 +- src/replica/ingest/IngestRequest.cc | 2 +- src/replica/ingest/IngestRequest.h | 6 +- src/replica/ingest/IngestRequestMgr.cc | 4 +- src/replica/ingest/IngestResourceMgrP.cc | 4 +- src/replica/ingest/IngestSvc.cc | 2 +- src/replica/ingest/IngestSvc.h | 2 +- src/replica/ingest/IngestSvcConn.cc | 4 +- src/replica/ingest/IngestSvcConn.h | 8 +-- .../TransactionContrib.cc | 2 +- .../{database => ingest}/TransactionContrib.h | 4 +- src/replica/jobs/AbortTransactionJob.cc | 4 +- src/replica/jobs/AbortTransactionJob.h | 2 +- src/replica/jobs/ClusterHealthJob.cc | 4 +- src/replica/jobs/CreateReplicaJob.cc | 6 +- src/replica/jobs/CreateReplicaJob.h | 4 +- src/replica/jobs/DeleteReplicaJob.cc | 6 +- src/replica/jobs/DeleteReplicaJob.h | 2 +- src/replica/jobs/DeleteWorkerJob.cc | 6 +- src/replica/jobs/DeleteWorkerJob.h | 2 +- src/replica/jobs/DirectorIndexJob.cc | 4 +- src/replica/jobs/DirectorIndexJob.h | 2 +- src/replica/jobs/FindAllJob.cc | 2 +- src/replica/jobs/FindAllJob.h | 4 +- src/replica/jobs/FixUpJob.cc | 2 +- src/replica/jobs/FixUpJob.h | 2 +- src/replica/jobs/Job.cc | 6 +- src/replica/jobs/Job.h | 6 +- src/replica/jobs/MoveReplicaJob.h | 2 +- src/replica/jobs/PurgeJob.cc | 2 +- src/replica/jobs/PurgeJob.h | 2 +- src/replica/jobs/QservGetReplicasJob.cc | 2 +- src/replica/jobs/QservGetReplicasJob.h | 6 +- src/replica/jobs/QservStatusJob.cc | 4 +- src/replica/jobs/QservSyncJob.cc | 4 +- src/replica/jobs/RebalanceJob.cc | 6 +- src/replica/jobs/RebalanceJob.h | 2 +- src/replica/jobs/ReplicateJob.cc | 4 +- src/replica/jobs/ReplicateJob.h | 2 +- src/replica/jobs/ServiceManagementJob.h | 4 +- src/replica/jobs/SqlAlterTablesJob.h | 2 +- src/replica/jobs/SqlCreateDbJob.cc | 2 +- src/replica/jobs/SqlCreateIndexesJob.h | 2 +- src/replica/jobs/SqlCreateTableJob.cc | 2 +- src/replica/jobs/SqlCreateTableJob.h | 2 +- src/replica/jobs/SqlCreateTablesJob.h | 2 +- src/replica/jobs/SqlDeleteDbJob.cc | 2 +- .../jobs/SqlDeleteTablePartitionJob.cc | 6 +- src/replica/jobs/SqlDeleteTablePartitionJob.h | 2 +- src/replica/jobs/SqlDisableDbJob.cc | 2 +- src/replica/jobs/SqlDropIndexesJob.h | 2 +- src/replica/jobs/SqlEnableDbJob.cc | 2 +- src/replica/jobs/SqlGetIndexesJob.h | 2 +- src/replica/jobs/SqlGrantAccessJob.cc | 2 +- src/replica/jobs/SqlJob.cc | 10 ++-- src/replica/jobs/SqlJob.h | 2 +- src/replica/jobs/SqlJobResult.cc | 2 +- src/replica/jobs/SqlJobResult.h | 2 +- src/replica/jobs/SqlQueryJob.cc | 2 +- src/replica/jobs/SqlRowStatsJob.cc | 2 +- src/replica/jobs/SqlRowStatsJob.h | 2 +- src/replica/jobs/VerifyJob.cc | 4 +- src/replica/mysql/DatabaseMySQL.cc | 2 +- src/replica/mysql/DatabaseMySQL.h | 4 +- src/replica/mysql/DatabaseMySQLGenerator.h | 4 +- src/replica/mysql/DatabaseMySQLTypes.cc | 2 +- src/replica/mysql/DatabaseMySQLTypes.h | 2 +- src/replica/mysql/DatabaseMySQLUtils.h | 2 +- src/replica/qserv/CMakeLists.txt | 4 ++ .../qserv/GetReplicasQservMgtRequest.cc | 4 +- .../qserv/GetReplicasQservMgtRequest.h | 2 +- src/replica/qserv/QservCzarMgtRequest.cc | 2 +- src/replica/qserv/QservMgtRequest.cc | 2 +- src/replica/qserv/QservMgtRequest.h | 6 +- src/replica/qserv/QservMgtServices.h | 2 +- src/replica/qserv/QservWorkerMgtRequest.cc | 4 +- .../qserv/RemoveReplicaQservMgtRequest.cc | 2 +- .../qserv/SetReplicasQservMgtRequest.cc | 4 +- .../qserv/SetReplicasQservMgtRequest.h | 2 +- src/replica/{ => qserv}/XrdCmsgetVnId.cc | 0 src/replica/registry/Registry.h | 2 +- src/replica/registry/RegistryHttpSvc.h | 4 +- src/replica/registry/RegistryHttpSvcMod.h | 2 +- src/replica/registry/RegistryServices.h | 2 +- src/replica/requests/CMakeLists.txt | 1 + src/replica/requests/DeleteRequest.cc | 8 +-- src/replica/requests/DeleteRequest.h | 4 +- src/replica/requests/DirectorIndexRequest.cc | 8 +-- src/replica/requests/DirectorIndexRequest.h | 2 +- src/replica/requests/DisposeRequest.cc | 2 +- src/replica/requests/DisposeRequest.h | 2 +- src/replica/requests/EchoRequest.cc | 10 ++-- src/replica/requests/EchoRequest.h | 2 +- src/replica/requests/FindAllRequest.cc | 8 +-- src/replica/requests/FindAllRequest.h | 4 +- src/replica/requests/FindRequest.cc | 10 ++-- src/replica/requests/FindRequest.h | 4 +- src/replica/requests/Messenger.h | 4 +- src/replica/requests/MessengerConnector.cc | 2 +- src/replica/requests/MessengerConnector.h | 6 +- src/replica/requests/ReplicationRequest.cc | 8 +-- src/replica/requests/ReplicationRequest.h | 4 +- src/replica/requests/Request.cc | 6 +- src/replica/requests/Request.h | 10 ++-- src/replica/requests/RequestMessenger.cc | 2 +- src/replica/requests/RequestMessenger.h | 6 +- src/replica/requests/RequestTracker.cc | 2 +- src/replica/requests/RequestTracker.h | 2 +- .../requests/ServiceManagementRequest.h | 2 +- .../requests/ServiceManagementRequestBase.cc | 8 +-- .../requests/ServiceManagementRequestBase.h | 2 +- src/replica/requests/SqlAlterTablesRequest.cc | 2 +- src/replica/requests/SqlAlterTablesRequest.h | 2 +- src/replica/requests/SqlCreateDbRequest.cc | 2 +- .../requests/SqlCreateIndexesRequest.cc | 2 +- .../requests/SqlCreateIndexesRequest.h | 2 +- src/replica/requests/SqlCreateTableRequest.cc | 2 +- src/replica/requests/SqlCreateTableRequest.h | 2 +- .../requests/SqlCreateTablesRequest.cc | 2 +- src/replica/requests/SqlCreateTablesRequest.h | 2 +- src/replica/requests/SqlDeleteDbRequest.cc | 2 +- .../SqlDeleteTablePartitionRequest.cc | 2 +- .../requests/SqlDeleteTablePartitionRequest.h | 2 +- src/replica/requests/SqlDeleteTableRequest.cc | 2 +- src/replica/requests/SqlDisableDbRequest.cc | 2 +- src/replica/requests/SqlDropIndexesRequest.cc | 2 +- src/replica/requests/SqlDropIndexesRequest.h | 2 +- src/replica/requests/SqlEnableDbRequest.cc | 2 +- src/replica/requests/SqlGetIndexesRequest.cc | 2 +- src/replica/requests/SqlGetIndexesRequest.h | 2 +- src/replica/requests/SqlGrantAccessRequest.cc | 2 +- src/replica/requests/SqlQueryRequest.cc | 2 +- .../SqlRemoveTablePartitionsRequest.cc | 2 +- src/replica/requests/SqlRequest.cc | 6 +- src/replica/requests/SqlRequest.h | 6 +- src/replica/{ => requests}/SqlResultSet.cc | 2 +- src/replica/{ => requests}/SqlResultSet.h | 2 +- src/replica/requests/SqlRowStatsRequest.h | 2 +- src/replica/requests/StatusRequest.h | 12 ++-- src/replica/requests/StatusRequestBase.cc | 4 +- src/replica/requests/StatusRequestBase.h | 4 +- src/replica/requests/StopRequest.h | 12 ++-- src/replica/requests/StopRequestBase.cc | 8 +-- src/replica/requests/StopRequestBase.h | 4 +- src/replica/services/CMakeLists.txt | 11 ++++ src/replica/{ => services}/ChunkLocker.cc | 2 +- src/replica/{ => services}/ChunkLocker.h | 2 +- .../DatabaseServices.cc | 4 +- .../{database => services}/DatabaseServices.h | 10 ++-- .../DatabaseServicesMySQL.cc | 12 ++-- .../DatabaseServicesMySQL.h | 4 +- .../DatabaseServicesPool.cc | 2 +- .../DatabaseServicesPool.h | 4 +- src/replica/{ => services}/ServiceProvider.cc | 5 +- src/replica/{ => services}/ServiceProvider.h | 6 +- src/replica/tests/testChunkLocker.cc | 2 +- src/replica/tests/testChunkNumber.cc | 2 +- src/replica/tests/testChunkedTable.cc | 2 +- src/replica/tests/testConfiguration.cc | 4 +- src/replica/tests/testConnectionParams.cc | 2 +- src/replica/tests/testCsv.cc | 2 +- src/replica/tests/testFileUtils.cc | 2 +- src/replica/tests/testIngestRequestMgr.cc | 2 +- src/replica/tests/testMessageQueue.cc | 2 +- src/replica/tests/testNamedMutexRegistry.cc | 6 +- src/replica/tests/testReplicaInfo.cc | 2 +- src/replica/tests/testSemanticMap.cc | 2 +- src/replica/tests/testSqlResultSet.cc | 2 +- src/replica/tests/testSqlSchemaUtils.cc | 2 +- src/replica/tests/testTypes.cc | 2 +- src/replica/util/CMakeLists.txt | 20 +++++++ src/replica/{ => util}/ChunkNumber.cc | 4 +- src/replica/{ => util}/ChunkNumber.h | 0 src/replica/{ => util}/ChunkedTable.cc | 2 +- src/replica/{ => util}/ChunkedTable.h | 0 src/replica/{ => util}/Common.cc | 2 +- src/replica/{ => util}/Common.h | 2 +- src/replica/{ => util}/Csv.cc | 2 +- src/replica/{ => util}/Csv.h | 2 +- src/replica/{ => util}/ErrorReporting.h | 2 +- src/replica/{ => util}/FileUtils.cc | 2 +- src/replica/{ => util}/FileUtils.h | 0 src/replica/{ => util}/HttpSvc.cc | 2 +- src/replica/{ => util}/HttpSvc.h | 2 +- src/replica/{ => util}/MessageQueue.h | 20 ++++--- src/replica/{ => util}/Mutex.cc | 2 +- src/replica/{ => util}/Mutex.h | 0 src/replica/{ => util}/NamedMutexRegistry.cc | 2 +- src/replica/{ => util}/NamedMutexRegistry.h | 2 +- src/replica/{ => util}/OneWayFailer.h | 10 +--- src/replica/{ => util}/Performance.cc | 2 +- src/replica/{ => util}/Performance.h | 0 src/replica/{ => util}/ProtocolBuffer.cc | 2 +- src/replica/{ => util}/ProtocolBuffer.h | 0 src/replica/{ => util}/ReplicaInfo.cc | 2 +- src/replica/{ => util}/ReplicaInfo.h | 0 src/replica/{ => util}/SemanticMaps.h | 0 src/replica/{ => util}/SqlSchemaUtils.cc | 2 +- src/replica/{ => util}/SqlSchemaUtils.h | 2 +- .../{ => util}/SuccessRateGenerator.cc | 2 +- src/replica/{ => util}/SuccessRateGenerator.h | 2 +- src/replica/worker/CMakeLists.txt | 3 + src/replica/{ => worker}/FileClient.cc | 6 +- src/replica/{ => worker}/FileClient.h | 2 +- src/replica/{ => worker}/FileServer.cc | 4 +- src/replica/{ => worker}/FileServer.h | 4 +- .../{ => worker}/FileServerConnection.cc | 4 +- .../{ => worker}/FileServerConnection.h | 4 +- src/replica/worker/WorkerDeleteRequest.cc | 4 +- src/replica/worker/WorkerDeleteRequest.h | 2 +- .../worker/WorkerDirectorIndexRequest.cc | 4 +- src/replica/worker/WorkerEchoRequest.cc | 2 +- src/replica/worker/WorkerFindAllRequest.cc | 4 +- src/replica/worker/WorkerFindAllRequest.h | 2 +- src/replica/worker/WorkerFindRequest.cc | 4 +- src/replica/worker/WorkerFindRequest.h | 2 +- src/replica/worker/WorkerProcessor.cc | 2 +- src/replica/worker/WorkerProcessor.h | 4 +- .../worker/WorkerReplicationRequest.cc | 6 +- src/replica/worker/WorkerReplicationRequest.h | 2 +- src/replica/worker/WorkerRequest.cc | 4 +- src/replica/worker/WorkerRequest.h | 8 +-- src/replica/worker/WorkerRequestFactory.cc | 2 +- src/replica/worker/WorkerRequestFactory.h | 2 +- src/replica/worker/WorkerServer.cc | 2 +- src/replica/worker/WorkerServer.h | 2 +- src/replica/worker/WorkerServerConnection.cc | 4 +- src/replica/worker/WorkerServerConnection.h | 4 +- src/replica/worker/WorkerSqlRequest.cc | 4 +- src/replica/worker/WorkerSqlRequest.h | 4 +- 347 files changed, 732 insertions(+), 703 deletions(-) create mode 100644 src/replica/contr/CMakeLists.txt rename src/replica/{ => contr}/Controller.cc (99%) rename src/replica/{ => contr}/Controller.h (99%) rename src/replica/{ => contr}/DeleteWorkerTask.cc (97%) rename src/replica/{ => contr}/DeleteWorkerTask.h (99%) rename src/replica/{ => contr}/EventLogger.cc (95%) rename src/replica/{ => contr}/EventLogger.h (98%) rename src/replica/{ => contr}/HealthMonitorTask.cc (98%) rename src/replica/{ => contr}/HealthMonitorTask.h (98%) rename src/replica/{ => contr}/HttpCatalogsModule.cc (98%) rename src/replica/{ => contr}/HttpCatalogsModule.h (97%) rename src/replica/{ => contr}/HttpConfigurationModule.cc (98%) rename src/replica/{ => contr}/HttpConfigurationModule.h (99%) rename src/replica/{ => contr}/HttpControllersModule.cc (97%) rename src/replica/{ => contr}/HttpControllersModule.h (98%) rename src/replica/{ => contr}/HttpDirectorIndexModule.cc (98%) rename src/replica/{ => contr}/HttpDirectorIndexModule.h (97%) rename src/replica/{ => contr}/HttpExportModule.cc (97%) rename src/replica/{ => contr}/HttpExportModule.h (97%) rename src/replica/{ => contr}/HttpIngestChunksModule.cc (98%) rename src/replica/{ => contr}/HttpIngestChunksModule.h (97%) rename src/replica/{ => contr}/HttpIngestConfigModule.cc (98%) rename src/replica/{ => contr}/HttpIngestConfigModule.h (97%) rename src/replica/{ => contr}/HttpIngestModule.cc (99%) rename src/replica/{ => contr}/HttpIngestModule.h (99%) rename src/replica/{ => contr}/HttpIngestTransModule.cc (99%) rename src/replica/{ => contr}/HttpIngestTransModule.h (98%) rename src/replica/{ => contr}/HttpJobsModule.cc (96%) rename src/replica/{ => contr}/HttpJobsModule.h (98%) rename src/replica/{ => contr}/HttpModule.cc (97%) rename src/replica/{ => contr}/HttpModule.h (98%) rename src/replica/{ => contr}/HttpProcessor.cc (97%) rename src/replica/{ => contr}/HttpProcessor.h (91%) rename src/replica/{ => contr}/HttpProcessorConfig.h (100%) rename src/replica/{ => contr}/HttpQservMonitorModule.cc (99%) rename src/replica/{ => contr}/HttpQservMonitorModule.h (99%) rename src/replica/{ => contr}/HttpQservSqlModule.cc (98%) rename src/replica/{ => contr}/HttpQservSqlModule.h (98%) rename src/replica/{ => contr}/HttpReplicationLevelsModule.cc (98%) rename src/replica/{ => contr}/HttpReplicationLevelsModule.h (97%) rename src/replica/{ => contr}/HttpRequestsModule.cc (96%) rename src/replica/{ => contr}/HttpRequestsModule.h (98%) rename src/replica/{ => contr}/HttpSqlIndexModule.cc (99%) rename src/replica/{ => contr}/HttpSqlIndexModule.h (97%) rename src/replica/{ => contr}/HttpSqlSchemaModule.cc (99%) rename src/replica/{ => contr}/HttpSqlSchemaModule.h (97%) rename src/replica/{ => contr}/HttpWorkerStatusModule.cc (96%) rename src/replica/{ => contr}/HttpWorkerStatusModule.h (96%) rename src/replica/{ => contr}/ReplicationTask.cc (98%) rename src/replica/{ => contr}/ReplicationTask.h (99%) rename src/replica/{ => contr}/Task.cc (98%) rename src/replica/{ => contr}/Task.h (98%) delete mode 100644 src/replica/database/CMakeLists.txt create mode 100644 src/replica/export/CMakeLists.txt rename src/replica/{ => export}/ExportClient.cc (99%) rename src/replica/{ => export}/ExportClient.h (99%) rename src/replica/{ => export}/ExportServer.cc (97%) rename src/replica/{ => export}/ExportServer.h (97%) rename src/replica/{ => export}/ExportServerConnection.cc (98%) rename src/replica/{ => export}/ExportServerConnection.h (98%) rename src/replica/{database => ingest}/TransactionContrib.cc (99%) rename src/replica/{database => ingest}/TransactionContrib.h (99%) rename src/replica/{ => qserv}/XrdCmsgetVnId.cc (100%) rename src/replica/{ => requests}/SqlResultSet.cc (99%) rename src/replica/{ => requests}/SqlResultSet.h (99%) create mode 100644 src/replica/services/CMakeLists.txt rename src/replica/{ => services}/ChunkLocker.cc (99%) rename src/replica/{ => services}/ChunkLocker.h (99%) rename src/replica/{database => services}/DatabaseServices.cc (98%) rename src/replica/{database => services}/DatabaseServices.h (99%) rename src/replica/{database => services}/DatabaseServicesMySQL.cc (99%) rename src/replica/{database => services}/DatabaseServicesMySQL.h (99%) rename src/replica/{database => services}/DatabaseServicesPool.cc (99%) rename src/replica/{database => services}/DatabaseServicesPool.h (99%) rename src/replica/{ => services}/ServiceProvider.cc (97%) rename src/replica/{ => services}/ServiceProvider.h (98%) create mode 100644 src/replica/util/CMakeLists.txt rename src/replica/{ => util}/ChunkNumber.cc (98%) rename src/replica/{ => util}/ChunkNumber.h (100%) rename src/replica/{ => util}/ChunkedTable.cc (98%) rename src/replica/{ => util}/ChunkedTable.h (100%) rename src/replica/{ => util}/Common.cc (99%) rename src/replica/{ => util}/Common.h (99%) rename src/replica/{ => util}/Csv.cc (99%) rename src/replica/{ => util}/Csv.h (99%) rename src/replica/{ => util}/ErrorReporting.h (98%) rename src/replica/{ => util}/FileUtils.cc (99%) rename src/replica/{ => util}/FileUtils.h (100%) rename src/replica/{ => util}/HttpSvc.cc (98%) rename src/replica/{ => util}/HttpSvc.h (98%) rename src/replica/{ => util}/MessageQueue.h (93%) rename src/replica/{ => util}/Mutex.cc (98%) rename src/replica/{ => util}/Mutex.h (100%) rename src/replica/{ => util}/NamedMutexRegistry.cc (98%) rename src/replica/{ => util}/NamedMutexRegistry.h (98%) rename src/replica/{ => util}/OneWayFailer.h (90%) rename src/replica/{ => util}/Performance.cc (98%) rename src/replica/{ => util}/Performance.h (100%) rename src/replica/{ => util}/ProtocolBuffer.cc (99%) rename src/replica/{ => util}/ProtocolBuffer.h (100%) rename src/replica/{ => util}/ReplicaInfo.cc (99%) rename src/replica/{ => util}/ReplicaInfo.h (100%) rename src/replica/{ => util}/SemanticMaps.h (100%) rename src/replica/{ => util}/SqlSchemaUtils.cc (98%) rename src/replica/{ => util}/SqlSchemaUtils.h (98%) rename src/replica/{ => util}/SuccessRateGenerator.cc (96%) rename src/replica/{ => util}/SuccessRateGenerator.h (98%) rename src/replica/{ => worker}/FileClient.cc (98%) rename src/replica/{ => worker}/FileClient.h (99%) rename src/replica/{ => worker}/FileServer.cc (97%) rename src/replica/{ => worker}/FileServer.h (97%) rename src/replica/{ => worker}/FileServerConnection.cc (99%) rename src/replica/{ => worker}/FileServerConnection.h (98%) diff --git a/src/replica/CMakeLists.txt b/src/replica/CMakeLists.txt index fd2452e48f..2d02c94bb7 100644 --- 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 index f22e0ad405..f68a1e8c6d 100644 --- 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 index e1a21f3d08..202d31c7fe 100644 --- 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 index 5b398ea813..f56f97fc96 100644 --- a/src/replica/apps/AdminApp.cc +++ b/src/replica/apps/AdminApp.cc @@ -29,9 +29,9 @@ #include // 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 index f91a5a39ee..1a0bb8d19e 100644 --- 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 index 3971738b6a..c07d44aaa9 100644 --- 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 index 95bf89b5b6..a40e4d9eab 100644 --- 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 index 49b6fbffe3..ab4651084c 100644 --- a/src/replica/apps/CheckSumApp.cc +++ b/src/replica/apps/CheckSumApp.cc @@ -26,7 +26,7 @@ #include // 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 index 9eebfbd9d3..74540743ce 100644 --- 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 index 8d405dc3b4..4c68885b43 100644 --- a/src/replica/apps/ClusterHealthApp.cc +++ b/src/replica/apps/ClusterHealthApp.cc @@ -28,7 +28,7 @@ #include // 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 index 1f7f5d9eed..733750d224 100644 --- 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 index 4a418eec77..24de288ae4 100644 --- a/src/replica/apps/ConfigAppBase.cc +++ b/src/replica/apps/ConfigAppBase.cc @@ -27,7 +27,7 @@ #include // 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 index 73ee95dcb2..f206038929 100644 --- 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 index b4b8aa6d67..628621cf71 100644 --- a/src/replica/apps/ControllerApp.cc +++ b/src/replica/apps/ControllerApp.cc @@ -28,7 +28,6 @@ #include // 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 index f3b0bb97d6..5b6a100a0b 100644 --- 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 index 2f9426fa13..661f7d8876 100644 --- 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 index 2599d204d0..2898d724bf 100644 --- 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 index 4465e61027..b3f436410a 100644 --- 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 index 358731e0bf..4fb32e079b 100644 --- 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 index 3d2f8c7336..8e2d0f60af 100644 --- 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 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/FileExportApp.h b/src/replica/apps/FileExportApp.h index bf5c09a098..060d4c7883 100644 --- 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 index ada7debc0c..98b11407d2 100644 --- 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 index 14ea35528b..25d70e9061 100644 --- a/src/replica/apps/FileReadApp.cc +++ b/src/replica/apps/FileReadApp.cc @@ -30,7 +30,7 @@ #include // 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 index 026b09b87d..1d952d1f4e 100644 --- a/src/replica/apps/FileServerApp.cc +++ b/src/replica/apps/FileServerApp.cc @@ -26,7 +26,7 @@ #include // 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 index 6e2266a120..5bf05cb766 100644 --- 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 index 195f3d0089..5c5d753482 100644 --- a/src/replica/apps/MasterControllerHttpApp.cc +++ b/src/replica/apps/MasterControllerHttpApp.cc @@ -29,9 +29,9 @@ #include // 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 index 4cb62c5fe1..79b120948c 100644 --- 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 index 3e821c9ce1..220471fa66 100644 --- 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" diff --git a/src/replica/apps/MoveApp.cc b/src/replica/apps/MoveApp.cc index e06a512c09..cb5a17a49c 100644 --- a/src/replica/apps/MoveApp.cc +++ b/src/replica/apps/MoveApp.cc @@ -28,9 +28,9 @@ #include // Qserv headers -#include "replica/Controller.h" +#include "replica/contr/Controller.h" #include "replica/jobs/MoveReplicaJob.h" -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" using namespace std; diff --git a/src/replica/apps/PurgeApp.cc b/src/replica/apps/PurgeApp.cc index 1fa4953ed1..1e573211f9 100644 --- a/src/replica/apps/PurgeApp.cc +++ b/src/replica/apps/PurgeApp.cc @@ -29,9 +29,9 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/Controller.h" +#include "replica/contr/Controller.h" #include "replica/jobs/PurgeJob.h" -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" using namespace std; diff --git a/src/replica/apps/QservWorkerApp.h b/src/replica/apps/QservWorkerApp.h index 1f8c92c9eb..e82d0ca979 100644 --- a/src/replica/apps/QservWorkerApp.h +++ b/src/replica/apps/QservWorkerApp.h @@ -27,7 +27,7 @@ // Qserv headers #include "replica/apps/Application.h" -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/apps/QservWorkerPingApp.cc b/src/replica/apps/QservWorkerPingApp.cc index 624b2b636c..1e7f195d5a 100644 --- a/src/replica/apps/QservWorkerPingApp.cc +++ b/src/replica/apps/QservWorkerPingApp.cc @@ -32,7 +32,7 @@ // Qserv headers #include "replica/qserv/QservMgtServices.h" #include "replica/qserv/TestEchoQservMgtRequest.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" #include "util/BlockPost.h" using namespace std; diff --git a/src/replica/apps/RebalanceApp.cc b/src/replica/apps/RebalanceApp.cc index a7a21e8b1c..7ae010081a 100644 --- a/src/replica/apps/RebalanceApp.cc +++ b/src/replica/apps/RebalanceApp.cc @@ -29,9 +29,9 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/Controller.h" +#include "replica/contr/Controller.h" #include "replica/jobs/RebalanceJob.h" -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" #include "util/TablePrinter.h" using namespace std; diff --git a/src/replica/apps/ReplicateApp.cc b/src/replica/apps/ReplicateApp.cc index 1c55a2cb4c..406d8e4cbb 100644 --- a/src/replica/apps/ReplicateApp.cc +++ b/src/replica/apps/ReplicateApp.cc @@ -29,9 +29,9 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/Controller.h" +#include "replica/contr/Controller.h" #include "replica/jobs/ReplicateJob.h" -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" using namespace std; diff --git a/src/replica/apps/SqlApp.cc b/src/replica/apps/SqlApp.cc index f7cb584f1e..95cc438bb4 100644 --- a/src/replica/apps/SqlApp.cc +++ b/src/replica/apps/SqlApp.cc @@ -30,7 +30,7 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/Controller.h" +#include "replica/contr/Controller.h" #include "replica/jobs/SqlAlterTablesJob.h" #include "replica/jobs/SqlCreateDbJob.h" #include "replica/jobs/SqlCreateIndexesJob.h" @@ -48,8 +48,8 @@ #include "replica/jobs/SqlQueryJob.h" #include "replica/jobs/SqlRemoveTablePartitionsJob.h" #include "replica/jobs/SqlRowStatsJob.h" -#include "replica/SqlResultSet.h" -#include "replica/SqlSchemaUtils.h" +#include "replica/requests/SqlResultSet.h" +#include "replica/util/SqlSchemaUtils.h" using namespace std; diff --git a/src/replica/apps/SqlApp.h b/src/replica/apps/SqlApp.h index 52b9b816f6..ddc45b8fa9 100644 --- a/src/replica/apps/SqlApp.h +++ b/src/replica/apps/SqlApp.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/SyncApp.cc b/src/replica/apps/SyncApp.cc index a64004b75d..822330f1a8 100644 --- a/src/replica/apps/SyncApp.cc +++ b/src/replica/apps/SyncApp.cc @@ -28,7 +28,7 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/Controller.h" +#include "replica/contr/Controller.h" #include "replica/jobs/QservSyncJob.h" #include "util/TablePrinter.h" diff --git a/src/replica/apps/TransactionsApp.cc b/src/replica/apps/TransactionsApp.cc index f99a9f7f81..de4dc70359 100644 --- a/src/replica/apps/TransactionsApp.cc +++ b/src/replica/apps/TransactionsApp.cc @@ -28,10 +28,10 @@ #include // Qserv headers -#include "replica/database/DatabaseServices.h" -#include "replica/NamedMutexRegistry.h" -#include "replica/ServiceProvider.h" -#include "replica/Mutex.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Mutex.h" +#include "replica/util/NamedMutexRegistry.h" #include "util/TablePrinter.h" #include "util/TimeUtils.h" diff --git a/src/replica/apps/TransactionsApp.h b/src/replica/apps/TransactionsApp.h index fe88062ba2..d041c8b8ff 100644 --- a/src/replica/apps/TransactionsApp.h +++ b/src/replica/apps/TransactionsApp.h @@ -28,7 +28,7 @@ // Qserv headers #include "replica/apps/Application.h" -#include "replica/Common.h" +#include "replica/util/Common.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/apps/VerifyApp.cc b/src/replica/apps/VerifyApp.cc index db609915a5..09b59ffad9 100644 --- a/src/replica/apps/VerifyApp.cc +++ b/src/replica/apps/VerifyApp.cc @@ -29,9 +29,9 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/Controller.h" +#include "replica/contr/Controller.h" #include "replica/jobs/VerifyJob.h" -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" using namespace std; diff --git a/src/replica/apps/WorkerApp.cc b/src/replica/apps/WorkerApp.cc index f49c92de63..ca5d6c1659 100644 --- a/src/replica/apps/WorkerApp.cc +++ b/src/replica/apps/WorkerApp.cc @@ -30,15 +30,15 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/mysql/DatabaseMySQL.h" -#include "replica/mysql/DatabaseMySQLUtils.h" -#include "replica/ExportServer.h" -#include "replica/FileServer.h" -#include "replica/FileUtils.h" +#include "replica/export/ExportServer.h" #include "replica/ingest/IngestHttpSvc.h" #include "replica/ingest/IngestSvc.h" +#include "replica/mysql/DatabaseMySQL.h" +#include "replica/mysql/DatabaseMySQLUtils.h" #include "replica/registry/Registry.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/FileUtils.h" +#include "replica/worker/FileServer.h" #include "replica/worker/WorkerProcessor.h" #include "replica/worker/WorkerRequestFactory.h" #include "replica/worker/WorkerServer.h" diff --git a/src/replica/config/ConfigDatabase.cc b/src/replica/config/ConfigDatabase.cc index a9505dbf44..fb811c76f4 100644 --- a/src/replica/config/ConfigDatabase.cc +++ b/src/replica/config/ConfigDatabase.cc @@ -30,7 +30,7 @@ // Qserv headers #include "global/constants.h" #include "replica/config/ConfigDatabaseFamily.h" -#include "replica/Performance.h" +#include "replica/util/Performance.h" #include "util/TimeUtils.h" using namespace std; diff --git a/src/replica/config/ConfigDatabase.h b/src/replica/config/ConfigDatabase.h index e51b937214..ff7241ab1c 100644 --- a/src/replica/config/ConfigDatabase.h +++ b/src/replica/config/ConfigDatabase.h @@ -33,8 +33,8 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Common.h" #include "replica/config/ConfigTable.h" +#include "replica/util/Common.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/config/ConfigDatabaseFamily.cc b/src/replica/config/ConfigDatabaseFamily.cc index 9a39714ea1..a2c134fe48 100644 --- a/src/replica/config/ConfigDatabaseFamily.cc +++ b/src/replica/config/ConfigDatabaseFamily.cc @@ -27,7 +27,7 @@ #include // Qserv headers -#include "replica/ChunkNumber.h" +#include "replica/util/ChunkNumber.h" using namespace std; using json = nlohmann::json; diff --git a/src/replica/config/ConfigTable.cc b/src/replica/config/ConfigTable.cc index 71fe349801..889d029315 100644 --- a/src/replica/config/ConfigTable.cc +++ b/src/replica/config/ConfigTable.cc @@ -30,7 +30,7 @@ // Qserv headers #include "global/constants.h" -#include "replica/Performance.h" +#include "replica/util/Performance.h" using namespace std; using json = nlohmann::json; diff --git a/src/replica/config/ConfigTable.h b/src/replica/config/ConfigTable.h index 5116425580..78b57c53f9 100644 --- a/src/replica/config/ConfigTable.h +++ b/src/replica/config/ConfigTable.h @@ -32,7 +32,7 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Common.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/config/Configuration.cc b/src/replica/config/Configuration.cc index 1c983ac10c..6f12e29f90 100644 --- a/src/replica/config/Configuration.cc +++ b/src/replica/config/Configuration.cc @@ -32,7 +32,7 @@ #include "replica/config/ConfigParserMySQL.h" #include "replica/mysql/DatabaseMySQLExceptions.h" #include "replica/mysql/DatabaseMySQLGenerator.h" -#include "replica/Performance.h" +#include "replica/util/Performance.h" #include "util/Timer.h" #include "util/TimeUtils.h" diff --git a/src/replica/config/Configuration.h b/src/replica/config/Configuration.h index 6431829a2d..e881b6f460 100644 --- a/src/replica/config/Configuration.h +++ b/src/replica/config/Configuration.h @@ -43,7 +43,6 @@ // Qserv headers #include "global/constants.h" -#include "replica/Common.h" #include "replica/config/ConfigCzar.h" #include "replica/config/ConfigDatabase.h" #include "replica/config/ConfigDatabaseFamily.h" @@ -53,7 +52,8 @@ #include "replica/mysql/DatabaseMySQL.h" #include "replica/mysql/DatabaseMySQLGenerator.h" #include "replica/mysql/DatabaseMySQLTypes.h" -#include "replica/Mutex.h" +#include "replica/util/Common.h" +#include "replica/util/Mutex.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/config/ConfigurationSchema.cc b/src/replica/config/ConfigurationSchema.cc index 79531890a9..6445946eb5 100644 --- a/src/replica/config/ConfigurationSchema.cc +++ b/src/replica/config/ConfigurationSchema.cc @@ -31,8 +31,8 @@ // Qserv headers #include "global/constants.h" -#include "replica/Common.h" -#include "replica/ProtocolBuffer.h" +#include "replica/util/Common.h" +#include "replica/util/ProtocolBuffer.h" using namespace std; using json = nlohmann::json; diff --git a/src/replica/contr/CMakeLists.txt b/src/replica/contr/CMakeLists.txt new file mode 100644 index 0000000000..6b6d2aa34a --- /dev/null +++ b/src/replica/contr/CMakeLists.txt @@ -0,0 +1,32 @@ +add_library(replica_contr OBJECT) +target_sources(replica_contr PRIVATE + Controller.cc + DeleteWorkerTask.cc + EventLogger.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 + HttpWorkerStatusModule.cc + ReplicationTask.cc + Task.cc +) +target_link_libraries(replica_contr PUBLIC + log + sphgeom +) diff --git a/src/replica/Controller.cc b/src/replica/contr/Controller.cc similarity index 99% rename from src/replica/Controller.cc rename to src/replica/contr/Controller.cc index 89364af4dc..5ff0a0871d 100644 --- a/src/replica/Controller.cc +++ b/src/replica/contr/Controller.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/Controller.h" +#include "replica/contr/Controller.h" // System headers #include @@ -31,24 +31,19 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/config/ConfigCzar.h" #include "replica/config/Configuration.h" #include "replica/config/ConfigWorker.h" -#include "replica/database/DatabaseServices.h" +#include "replica/registry/Registry.h" #include "replica/requests/DeleteRequest.h" #include "replica/requests/DisposeRequest.h" #include "replica/requests/EchoRequest.h" -#include "replica/FileUtils.h" #include "replica/requests/FindRequest.h" #include "replica/requests/FindAllRequest.h" #include "replica/requests/DirectorIndexRequest.h" #include "replica/requests/Messenger.h" -#include "replica/Performance.h" -#include "replica/registry/Registry.h" #include "replica/requests/ReplicationRequest.h" #include "replica/requests/ServiceManagementRequest.h" -#include "replica/ServiceProvider.h" #include "replica/requests/SqlAlterTablesRequest.h" #include "replica/requests/SqlQueryRequest.h" #include "replica/requests/SqlCreateDbRequest.h" @@ -67,6 +62,11 @@ #include "replica/requests/SqlRowStatsRequest.h" #include "replica/requests/StatusRequest.h" #include "replica/requests/StopRequest.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Common.h" +#include "replica/util/FileUtils.h" +#include "replica/util/Performance.h" #include "util/TimeUtils.h" // LSST headers diff --git a/src/replica/Controller.h b/src/replica/contr/Controller.h similarity index 99% rename from src/replica/Controller.h rename to src/replica/contr/Controller.h index d4654b1ac6..9741eb8a13 100644 --- a/src/replica/Controller.h +++ b/src/replica/contr/Controller.h @@ -35,10 +35,10 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/requests/Request.h" -#include "replica/ServiceProvider.h" -#include "replica/Mutex.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Common.h" +#include "replica/util/Mutex.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/DeleteWorkerTask.cc b/src/replica/contr/DeleteWorkerTask.cc similarity index 97% rename from src/replica/DeleteWorkerTask.cc rename to src/replica/contr/DeleteWorkerTask.cc index 967278c09f..cac8c894bb 100644 --- a/src/replica/DeleteWorkerTask.cc +++ b/src/replica/contr/DeleteWorkerTask.cc @@ -20,14 +20,14 @@ */ // Class header -#include "replica/DeleteWorkerTask.h" +#include "replica/contr/DeleteWorkerTask.h" // System headers #include #include // Qserv headers -#include "replica/database/DatabaseServices.h" +#include "replica/services/DatabaseServices.h" using namespace std; diff --git a/src/replica/DeleteWorkerTask.h b/src/replica/contr/DeleteWorkerTask.h similarity index 99% rename from src/replica/DeleteWorkerTask.h rename to src/replica/contr/DeleteWorkerTask.h index 3502470ba4..7fd158fd77 100644 --- a/src/replica/DeleteWorkerTask.h +++ b/src/replica/contr/DeleteWorkerTask.h @@ -26,8 +26,8 @@ #include // Qserv headers +#include "replica/contr/Task.h" #include "replica/jobs/DeleteWorkerJob.h" -#include "replica/Task.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/EventLogger.cc b/src/replica/contr/EventLogger.cc similarity index 95% rename from src/replica/EventLogger.cc rename to src/replica/contr/EventLogger.cc index 86bd585975..c2fdfd0cdf 100644 --- a/src/replica/EventLogger.cc +++ b/src/replica/contr/EventLogger.cc @@ -20,14 +20,14 @@ */ // Class header -#include "replica/EventLogger.h" +#include "replica/contr/EventLogger.h" // System headers #include // Qserv headers -#include "replica/database/DatabaseServices.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" #include "util/TimeUtils.h" // LSST headers diff --git a/src/replica/EventLogger.h b/src/replica/contr/EventLogger.h similarity index 98% rename from src/replica/EventLogger.h rename to src/replica/contr/EventLogger.h index 8ddba5065f..587d012404 100644 --- a/src/replica/EventLogger.h +++ b/src/replica/contr/EventLogger.h @@ -26,7 +26,7 @@ #include // Qserv headers -#include "replica/Controller.h" +#include "replica/contr/Controller.h" #include "replica/jobs/Job.h" // Forward declarations diff --git a/src/replica/HealthMonitorTask.cc b/src/replica/contr/HealthMonitorTask.cc similarity index 98% rename from src/replica/HealthMonitorTask.cc rename to src/replica/contr/HealthMonitorTask.cc index d37d623a0c..e807a33f00 100644 --- a/src/replica/HealthMonitorTask.cc +++ b/src/replica/contr/HealthMonitorTask.cc @@ -20,13 +20,13 @@ */ // Class header -#include "replica/HealthMonitorTask.h" +#include "replica/contr/HealthMonitorTask.h" // System headers #include // Qserv headers -#include "replica/database/DatabaseServices.h" +#include "replica/services/DatabaseServices.h" #include "util/TimeUtils.h" using namespace std; diff --git a/src/replica/HealthMonitorTask.h b/src/replica/contr/HealthMonitorTask.h similarity index 98% rename from src/replica/HealthMonitorTask.h rename to src/replica/contr/HealthMonitorTask.h index 3c47cbff2c..41f927db3b 100644 --- a/src/replica/HealthMonitorTask.h +++ b/src/replica/contr/HealthMonitorTask.h @@ -28,9 +28,9 @@ #include // Qserv headers +#include "replica/contr/Task.h" #include "replica/jobs/ClusterHealthJob.h" -#include "replica/Task.h" -#include "replica/Mutex.h" +#include "replica/util/Mutex.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpCatalogsModule.cc b/src/replica/contr/HttpCatalogsModule.cc similarity index 98% rename from src/replica/HttpCatalogsModule.cc rename to src/replica/contr/HttpCatalogsModule.cc index 1f1a653d17..ab2742a79f 100644 --- a/src/replica/HttpCatalogsModule.cc +++ b/src/replica/contr/HttpCatalogsModule.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/HttpCatalogsModule.h" +#include "replica/contr/HttpCatalogsModule.h" // System headers #include @@ -30,9 +30,9 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ReplicaInfo.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ReplicaInfo.h" #include "util/TimeUtils.h" using namespace std; diff --git a/src/replica/HttpCatalogsModule.h b/src/replica/contr/HttpCatalogsModule.h similarity index 97% rename from src/replica/HttpCatalogsModule.h rename to src/replica/contr/HttpCatalogsModule.h index cb9c4f247c..c9c9049161 100644 --- a/src/replica/HttpCatalogsModule.h +++ b/src/replica/contr/HttpCatalogsModule.h @@ -29,8 +29,8 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/HttpModule.h" -#include "replica/Mutex.h" +#include "replica/contr/HttpModule.h" +#include "replica/util/Mutex.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpConfigurationModule.cc b/src/replica/contr/HttpConfigurationModule.cc similarity index 98% rename from src/replica/HttpConfigurationModule.cc rename to src/replica/contr/HttpConfigurationModule.cc index c10d7a09a2..a289fe14d9 100644 --- a/src/replica/HttpConfigurationModule.cc +++ b/src/replica/contr/HttpConfigurationModule.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/HttpConfigurationModule.h" +#include "replica/contr/HttpConfigurationModule.h" // System headers #include @@ -33,8 +33,8 @@ #include "replica/config/Configuration.h" #include "replica/config/ConfigDatabase.h" #include "replica/config/ConfigurationSchema.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" using namespace std; using json = nlohmann::json; diff --git a/src/replica/HttpConfigurationModule.h b/src/replica/contr/HttpConfigurationModule.h similarity index 99% rename from src/replica/HttpConfigurationModule.h rename to src/replica/contr/HttpConfigurationModule.h index 413a2e4448..77427db57c 100644 --- a/src/replica/HttpConfigurationModule.h +++ b/src/replica/contr/HttpConfigurationModule.h @@ -29,7 +29,7 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/HttpModule.h" +#include "replica/contr/HttpModule.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpControllersModule.cc b/src/replica/contr/HttpControllersModule.cc similarity index 97% rename from src/replica/HttpControllersModule.cc rename to src/replica/contr/HttpControllersModule.cc index 5277f048f1..1d0d96bbfd 100644 --- a/src/replica/HttpControllersModule.cc +++ b/src/replica/contr/HttpControllersModule.cc @@ -20,15 +20,15 @@ */ // Class header -#include "replica/HttpControllersModule.h" +#include "replica/contr/HttpControllersModule.h" // System headers #include // Qserv headers #include "http/Exceptions.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" using namespace std; using json = nlohmann::json; diff --git a/src/replica/HttpControllersModule.h b/src/replica/contr/HttpControllersModule.h similarity index 98% rename from src/replica/HttpControllersModule.h rename to src/replica/contr/HttpControllersModule.h index 24d5e40122..b97d17c389 100644 --- a/src/replica/HttpControllersModule.h +++ b/src/replica/contr/HttpControllersModule.h @@ -29,7 +29,7 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/HttpModule.h" +#include "replica/contr/HttpModule.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpDirectorIndexModule.cc b/src/replica/contr/HttpDirectorIndexModule.cc similarity index 98% rename from src/replica/HttpDirectorIndexModule.cc rename to src/replica/contr/HttpDirectorIndexModule.cc index 28d4f2fe99..871f5daa4b 100644 --- a/src/replica/HttpDirectorIndexModule.cc +++ b/src/replica/contr/HttpDirectorIndexModule.cc @@ -20,15 +20,15 @@ */ // Class header -#include "replica/HttpDirectorIndexModule.h" +#include "replica/contr/HttpDirectorIndexModule.h" // Qserv headers #include "http/Exceptions.h" #include "replica/config/Configuration.h" -#include "replica/mysql/DatabaseMySQL.h" -#include "replica/database/DatabaseServices.h" #include "replica/jobs/DirectorIndexJob.h" -#include "replica/ServiceProvider.h" +#include "replica/mysql/DatabaseMySQL.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" using namespace std; using json = nlohmann::json; diff --git a/src/replica/HttpDirectorIndexModule.h b/src/replica/contr/HttpDirectorIndexModule.h similarity index 97% rename from src/replica/HttpDirectorIndexModule.h rename to src/replica/contr/HttpDirectorIndexModule.h index 4e0bfceacd..1ed5790b20 100644 --- a/src/replica/HttpDirectorIndexModule.h +++ b/src/replica/contr/HttpDirectorIndexModule.h @@ -29,8 +29,8 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Common.h" -#include "replica/HttpModule.h" +#include "replica/contr/HttpModule.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpExportModule.cc b/src/replica/contr/HttpExportModule.cc similarity index 97% rename from src/replica/HttpExportModule.cc rename to src/replica/contr/HttpExportModule.cc index 1162e8693b..5af2f5a40f 100644 --- a/src/replica/HttpExportModule.cc +++ b/src/replica/contr/HttpExportModule.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/HttpExportModule.h" +#include "replica/contr/HttpExportModule.h" // System headers #include @@ -28,12 +28,12 @@ // Qserv headers #include "http/Exceptions.h" #include "http/RequestBody.h" -#include "replica/ChunkedTable.h" #include "replica/config/Configuration.h" #include "replica/config/ConfigWorker.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ReplicaInfo.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ChunkedTable.h" +#include "replica/util/ReplicaInfo.h" using namespace std; using json = nlohmann::json; diff --git a/src/replica/HttpExportModule.h b/src/replica/contr/HttpExportModule.h similarity index 97% rename from src/replica/HttpExportModule.h rename to src/replica/contr/HttpExportModule.h index eb6f82dda4..2e75d61f52 100644 --- a/src/replica/HttpExportModule.h +++ b/src/replica/contr/HttpExportModule.h @@ -29,8 +29,8 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Common.h" -#include "replica/HttpModule.h" +#include "replica/contr/HttpModule.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpIngestChunksModule.cc b/src/replica/contr/HttpIngestChunksModule.cc similarity index 98% rename from src/replica/HttpIngestChunksModule.cc rename to src/replica/contr/HttpIngestChunksModule.cc index 9f46bb7603..24f39b3f47 100644 --- a/src/replica/HttpIngestChunksModule.cc +++ b/src/replica/contr/HttpIngestChunksModule.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/HttpIngestChunksModule.h" +#include "replica/contr/HttpIngestChunksModule.h" // System headers #include @@ -32,11 +32,11 @@ // Qserv headers #include "http/Exceptions.h" -#include "replica/ChunkNumber.h" #include "replica/config/Configuration.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ReplicaInfo.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ChunkNumber.h" +#include "replica/util/ReplicaInfo.h" #include "util/TimeUtils.h" using namespace std; diff --git a/src/replica/HttpIngestChunksModule.h b/src/replica/contr/HttpIngestChunksModule.h similarity index 97% rename from src/replica/HttpIngestChunksModule.h rename to src/replica/contr/HttpIngestChunksModule.h index 09b9b18e70..28e0f624a9 100644 --- a/src/replica/HttpIngestChunksModule.h +++ b/src/replica/contr/HttpIngestChunksModule.h @@ -29,9 +29,9 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Common.h" -#include "replica/HttpModule.h" -#include "replica/Mutex.h" +#include "replica/contr/HttpModule.h" +#include "replica/util/Common.h" +#include "replica/util/Mutex.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpIngestConfigModule.cc b/src/replica/contr/HttpIngestConfigModule.cc similarity index 98% rename from src/replica/HttpIngestConfigModule.cc rename to src/replica/contr/HttpIngestConfigModule.cc index 5b750fce12..2e1d74a92f 100644 --- a/src/replica/HttpIngestConfigModule.cc +++ b/src/replica/contr/HttpIngestConfigModule.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/HttpIngestConfigModule.h" +#include "replica/contr/HttpIngestConfigModule.h" // System headers #include @@ -30,7 +30,7 @@ #include "http/Client.h" #include "http/Exceptions.h" #include "replica/config/Configuration.h" -#include "replica/database/DatabaseServices.h" +#include "replica/services/DatabaseServices.h" using namespace std; using json = nlohmann::json; diff --git a/src/replica/HttpIngestConfigModule.h b/src/replica/contr/HttpIngestConfigModule.h similarity index 97% rename from src/replica/HttpIngestConfigModule.h rename to src/replica/contr/HttpIngestConfigModule.h index cf285846b8..00772191e5 100644 --- a/src/replica/HttpIngestConfigModule.h +++ b/src/replica/contr/HttpIngestConfigModule.h @@ -29,8 +29,8 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Common.h" -#include "replica/HttpModule.h" +#include "replica/contr/HttpModule.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpIngestModule.cc b/src/replica/contr/HttpIngestModule.cc similarity index 99% rename from src/replica/HttpIngestModule.cc rename to src/replica/contr/HttpIngestModule.cc index 03f19467b2..db3b85114c 100644 --- a/src/replica/HttpIngestModule.cc +++ b/src/replica/contr/HttpIngestModule.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/HttpIngestModule.h" +#include "replica/contr/HttpIngestModule.h" // System headers #include @@ -41,14 +41,10 @@ #include "css/DbInterfaceMySql.h" #include "global/constants.h" #include "http/Exceptions.h" -#include "replica/ChunkedTable.h" #include "replica/config/Configuration.h" #include "replica/mysql/DatabaseMySQL.h" -#include "replica/database/DatabaseServices.h" #include "replica/jobs/FindAllJob.h" #include "replica/jobs/QservSyncJob.h" -#include "replica/ReplicaInfo.h" -#include "replica/ServiceProvider.h" #include "replica/jobs/SqlCreateDbJob.h" #include "replica/jobs/SqlCreateTableJob.h" #include "replica/jobs/SqlCreateTablesJob.h" @@ -58,7 +54,11 @@ #include "replica/jobs/SqlGrantAccessJob.h" #include "replica/jobs/SqlEnableDbJob.h" #include "replica/jobs/SqlRemoveTablePartitionsJob.h" -#include "replica/SqlResultSet.h" +#include "replica/requests/SqlResultSet.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ChunkedTable.h" +#include "replica/util/ReplicaInfo.h" // LSST headers #include "lsst/sphgeom/Chunker.h" diff --git a/src/replica/HttpIngestModule.h b/src/replica/contr/HttpIngestModule.h similarity index 99% rename from src/replica/HttpIngestModule.h rename to src/replica/contr/HttpIngestModule.h index 6c4ae54684..59b7e40765 100644 --- a/src/replica/HttpIngestModule.h +++ b/src/replica/contr/HttpIngestModule.h @@ -29,9 +29,9 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Common.h" -#include "replica/HttpModule.h" +#include "replica/contr/HttpModule.h" #include "replica/jobs/SqlRowStatsJob.h" +#include "replica/util/Common.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpIngestTransModule.cc b/src/replica/contr/HttpIngestTransModule.cc similarity index 99% rename from src/replica/HttpIngestTransModule.cc rename to src/replica/contr/HttpIngestTransModule.cc index b66b91987f..b49c8e8cc4 100644 --- a/src/replica/HttpIngestTransModule.cc +++ b/src/replica/contr/HttpIngestTransModule.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/HttpIngestTransModule.h" +#include "replica/contr/HttpIngestTransModule.h" // System headers #include @@ -33,14 +33,14 @@ // Qserv headers #include "http/Exceptions.h" -#include "replica/jobs/AbortTransactionJob.h" #include "replica/config/Configuration.h" -#include "replica/mysql/DatabaseMySQL.h" -#include "replica/database/DatabaseServices.h" +#include "replica/jobs/AbortTransactionJob.h" #include "replica/jobs/DirectorIndexJob.h" -#include "replica/NamedMutexRegistry.h" -#include "replica/ServiceProvider.h" -#include "replica/Mutex.h" +#include "replica/mysql/DatabaseMySQL.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Mutex.h" +#include "replica/util/NamedMutexRegistry.h" using namespace std; using json = nlohmann::json; diff --git a/src/replica/HttpIngestTransModule.h b/src/replica/contr/HttpIngestTransModule.h similarity index 98% rename from src/replica/HttpIngestTransModule.h rename to src/replica/contr/HttpIngestTransModule.h index a518bc026d..948a931f1f 100644 --- a/src/replica/HttpIngestTransModule.h +++ b/src/replica/contr/HttpIngestTransModule.h @@ -29,8 +29,8 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Common.h" -#include "replica/HttpModule.h" +#include "replica/contr/HttpModule.h" +#include "replica/util/Common.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpJobsModule.cc b/src/replica/contr/HttpJobsModule.cc similarity index 96% rename from src/replica/HttpJobsModule.cc rename to src/replica/contr/HttpJobsModule.cc index 1d8bcf3450..1a049d30c1 100644 --- a/src/replica/HttpJobsModule.cc +++ b/src/replica/contr/HttpJobsModule.cc @@ -20,15 +20,15 @@ */ // Class header -#include "replica/HttpJobsModule.h" +#include "replica/contr/HttpJobsModule.h" // System headers #include // Qserv headers #include "http/Exceptions.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" using namespace std; using json = nlohmann::json; diff --git a/src/replica/HttpJobsModule.h b/src/replica/contr/HttpJobsModule.h similarity index 98% rename from src/replica/HttpJobsModule.h rename to src/replica/contr/HttpJobsModule.h index 5bdbe9f667..bf7edbb9ff 100644 --- a/src/replica/HttpJobsModule.h +++ b/src/replica/contr/HttpJobsModule.h @@ -29,7 +29,7 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/HttpModule.h" +#include "replica/contr/HttpModule.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpModule.cc b/src/replica/contr/HttpModule.cc similarity index 97% rename from src/replica/HttpModule.cc rename to src/replica/contr/HttpModule.cc index 9c5bb38cda..f64a9f80ca 100644 --- a/src/replica/HttpModule.cc +++ b/src/replica/contr/HttpModule.cc @@ -20,18 +20,18 @@ */ // Class header -#include "replica/HttpModule.h" +#include "replica/contr/HttpModule.h" // Qserv headers #include "css/CssAccess.h" #include "http/Exceptions.h" #include "replica/config/Configuration.h" #include "replica/config/ConfigDatabase.h" -#include "replica/Controller.h" -#include "replica/mysql/DatabaseMySQL.h" -#include "replica/database/DatabaseServices.h" +#include "replica/contr/Controller.h" #include "replica/jobs/ServiceManagementJob.h" -#include "replica/ServiceProvider.h" +#include "replica/mysql/DatabaseMySQL.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/HttpModule.h b/src/replica/contr/HttpModule.h similarity index 98% rename from src/replica/HttpModule.h rename to src/replica/contr/HttpModule.h index 4c27aa007d..ae4a4dabc4 100644 --- a/src/replica/HttpModule.h +++ b/src/replica/contr/HttpModule.h @@ -30,8 +30,8 @@ #include "qhttp/Request.h" #include "qhttp/Response.h" #include "replica/config/Configuration.h" -#include "replica/EventLogger.h" -#include "replica/HttpProcessorConfig.h" +#include "replica/contr/EventLogger.h" +#include "replica/contr/HttpProcessorConfig.h" // Forward declarations namespace lsst::qserv { diff --git a/src/replica/HttpProcessor.cc b/src/replica/contr/HttpProcessor.cc similarity index 97% rename from src/replica/HttpProcessor.cc rename to src/replica/contr/HttpProcessor.cc index 7735e35da8..89ffdb5aa0 100644 --- a/src/replica/HttpProcessor.cc +++ b/src/replica/contr/HttpProcessor.cc @@ -20,31 +20,31 @@ */ // Class header -#include "replica/HttpProcessor.h" +#include "replica/contr/HttpProcessor.h" // Qserv headers #include "http/MetaModule.h" #include "qhttp/Request.h" #include "qhttp/Response.h" #include "replica/config/ConfigParserMySQL.h" -#include "replica/HttpCatalogsModule.h" -#include "replica/HttpConfigurationModule.h" -#include "replica/HttpControllersModule.h" -#include "replica/HttpExportModule.h" -#include "replica/HttpIngestChunksModule.h" -#include "replica/HttpIngestConfigModule.h" -#include "replica/HttpIngestModule.h" -#include "replica/HttpDirectorIndexModule.h" -#include "replica/HttpIngestTransModule.h" -#include "replica/HttpJobsModule.h" -#include "replica/HttpQservMonitorModule.h" -#include "replica/HttpRequestsModule.h" -#include "replica/HttpReplicationLevelsModule.h" -#include "replica/HttpSqlIndexModule.h" -#include "replica/HttpSqlSchemaModule.h" -#include "replica/HttpWorkerStatusModule.h" -#include "replica/HttpQservSqlModule.h" -#include "replica/ServiceProvider.h" +#include "replica/contr/HttpCatalogsModule.h" +#include "replica/contr/HttpConfigurationModule.h" +#include "replica/contr/HttpControllersModule.h" +#include "replica/contr/HttpExportModule.h" +#include "replica/contr/HttpIngestChunksModule.h" +#include "replica/contr/HttpIngestConfigModule.h" +#include "replica/contr/HttpIngestModule.h" +#include "replica/contr/HttpDirectorIndexModule.h" +#include "replica/contr/HttpIngestTransModule.h" +#include "replica/contr/HttpJobsModule.h" +#include "replica/contr/HttpQservMonitorModule.h" +#include "replica/contr/HttpRequestsModule.h" +#include "replica/contr/HttpReplicationLevelsModule.h" +#include "replica/contr/HttpSqlIndexModule.h" +#include "replica/contr/HttpSqlSchemaModule.h" +#include "replica/contr/HttpWorkerStatusModule.h" +#include "replica/contr/HttpQservSqlModule.h" +#include "replica/services/ServiceProvider.h" // System headers #include diff --git a/src/replica/HttpProcessor.h b/src/replica/contr/HttpProcessor.h similarity index 91% rename from src/replica/HttpProcessor.h rename to src/replica/contr/HttpProcessor.h index becfe4aab7..c047592abe 100644 --- a/src/replica/HttpProcessor.h +++ b/src/replica/contr/HttpProcessor.h @@ -26,12 +26,12 @@ #include // Qserv headers -#include "replica/Controller.h" -#include "replica/EventLogger.h" -#include "replica/HealthMonitorTask.h" -#include "replica/HttpProcessorConfig.h" -#include "replica/HttpSvc.h" -#include "replica/NamedMutexRegistry.h" +#include "replica/contr/Controller.h" +#include "replica/contr/EventLogger.h" +#include "replica/contr/HealthMonitorTask.h" +#include "replica/contr/HttpProcessorConfig.h" +#include "replica/util/HttpSvc.h" +#include "replica/util/NamedMutexRegistry.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpProcessorConfig.h b/src/replica/contr/HttpProcessorConfig.h similarity index 100% rename from src/replica/HttpProcessorConfig.h rename to src/replica/contr/HttpProcessorConfig.h diff --git a/src/replica/HttpQservMonitorModule.cc b/src/replica/contr/HttpQservMonitorModule.cc similarity index 99% rename from src/replica/HttpQservMonitorModule.cc rename to src/replica/contr/HttpQservMonitorModule.cc index 7a2a013300..29e74ae390 100644 --- a/src/replica/HttpQservMonitorModule.cc +++ b/src/replica/contr/HttpQservMonitorModule.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/HttpQservMonitorModule.h" +#include "replica/contr/HttpQservMonitorModule.h" // System headers #include @@ -35,17 +35,16 @@ #include "css/CssError.h" #include "global/intTypes.h" #include "http/Exceptions.h" -#include "replica/Common.h" +#include "replica/config/Configuration.h" +#include "replica/config/ConfigDatabase.h" +#include "replica/jobs/QservStatusJob.h" #include "replica/mysql/DatabaseMySQL.h" #include "replica/mysql/DatabaseMySQLTypes.h" #include "replica/mysql/DatabaseMySQLUtils.h" -#include "replica/Common.h" -#include "replica/config/Configuration.h" -#include "replica/config/ConfigDatabase.h" -#include "replica/database/DatabaseServices.h" #include "replica/qserv/QservMgtServices.h" -#include "replica/jobs/QservStatusJob.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Common.h" #include "util/String.h" #include "wbase/TaskState.h" diff --git a/src/replica/HttpQservMonitorModule.h b/src/replica/contr/HttpQservMonitorModule.h similarity index 99% rename from src/replica/HttpQservMonitorModule.h rename to src/replica/contr/HttpQservMonitorModule.h index d424f9f240..d061c40b69 100644 --- a/src/replica/HttpQservMonitorModule.h +++ b/src/replica/contr/HttpQservMonitorModule.h @@ -32,8 +32,8 @@ // Qserv headers #include "global/intTypes.h" +#include "replica/contr/HttpModule.h" #include "replica/mysql/DatabaseMySQL.h" -#include "replica/HttpModule.h" // Forward declarations namespace lsst::qserv::wbase { diff --git a/src/replica/HttpQservSqlModule.cc b/src/replica/contr/HttpQservSqlModule.cc similarity index 98% rename from src/replica/HttpQservSqlModule.cc rename to src/replica/contr/HttpQservSqlModule.cc index df7edb09c9..a58f660869 100644 --- a/src/replica/HttpQservSqlModule.cc +++ b/src/replica/contr/HttpQservSqlModule.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/HttpQservSqlModule.h" +#include "replica/contr/HttpQservSqlModule.h" // System headers #include diff --git a/src/replica/HttpQservSqlModule.h b/src/replica/contr/HttpQservSqlModule.h similarity index 98% rename from src/replica/HttpQservSqlModule.h rename to src/replica/contr/HttpQservSqlModule.h index 7e75ccadfa..eac8a9b589 100644 --- a/src/replica/HttpQservSqlModule.h +++ b/src/replica/contr/HttpQservSqlModule.h @@ -29,7 +29,7 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/HttpModule.h" +#include "replica/contr/HttpModule.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpReplicationLevelsModule.cc b/src/replica/contr/HttpReplicationLevelsModule.cc similarity index 98% rename from src/replica/HttpReplicationLevelsModule.cc rename to src/replica/contr/HttpReplicationLevelsModule.cc index bf097206a4..2e0e67b8fc 100644 --- a/src/replica/HttpReplicationLevelsModule.cc +++ b/src/replica/contr/HttpReplicationLevelsModule.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/HttpReplicationLevelsModule.h" +#include "replica/contr/HttpReplicationLevelsModule.h" // System headers #include @@ -31,9 +31,9 @@ // Qserv headers #include "http/Exceptions.h" #include "replica/config/Configuration.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ReplicaInfo.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ReplicaInfo.h" #include "util/TimeUtils.h" using namespace std; diff --git a/src/replica/HttpReplicationLevelsModule.h b/src/replica/contr/HttpReplicationLevelsModule.h similarity index 97% rename from src/replica/HttpReplicationLevelsModule.h rename to src/replica/contr/HttpReplicationLevelsModule.h index 2604451350..ab73ab40aa 100644 --- a/src/replica/HttpReplicationLevelsModule.h +++ b/src/replica/contr/HttpReplicationLevelsModule.h @@ -29,9 +29,9 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/HealthMonitorTask.h" -#include "replica/HttpModule.h" -#include "replica/Mutex.h" +#include "replica/contr/HealthMonitorTask.h" +#include "replica/contr/HttpModule.h" +#include "replica/util/Mutex.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpRequestsModule.cc b/src/replica/contr/HttpRequestsModule.cc similarity index 96% rename from src/replica/HttpRequestsModule.cc rename to src/replica/contr/HttpRequestsModule.cc index 7a06eda6f9..6fdb69981f 100644 --- a/src/replica/HttpRequestsModule.cc +++ b/src/replica/contr/HttpRequestsModule.cc @@ -20,15 +20,15 @@ */ // Class header -#include "replica/HttpRequestsModule.h" +#include "replica/contr/HttpRequestsModule.h" // System headers #include // Qserv headers #include "http/Exceptions.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" using namespace std; using json = nlohmann::json; diff --git a/src/replica/HttpRequestsModule.h b/src/replica/contr/HttpRequestsModule.h similarity index 98% rename from src/replica/HttpRequestsModule.h rename to src/replica/contr/HttpRequestsModule.h index a81862effa..368ee37142 100644 --- a/src/replica/HttpRequestsModule.h +++ b/src/replica/contr/HttpRequestsModule.h @@ -29,7 +29,7 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/HttpModule.h" +#include "replica/contr/HttpModule.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpSqlIndexModule.cc b/src/replica/contr/HttpSqlIndexModule.cc similarity index 99% rename from src/replica/HttpSqlIndexModule.cc rename to src/replica/contr/HttpSqlIndexModule.cc index b4a20ef529..4bd8a76bd7 100644 --- a/src/replica/HttpSqlIndexModule.cc +++ b/src/replica/contr/HttpSqlIndexModule.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/HttpSqlIndexModule.h" +#include "replica/contr/HttpSqlIndexModule.h" // System headers #include @@ -35,7 +35,7 @@ #include "replica/jobs/SqlCreateIndexesJob.h" #include "replica/jobs/SqlDropIndexesJob.h" #include "replica/jobs/SqlGetIndexesJob.h" -#include "replica/SqlResultSet.h" +#include "replica/requests/SqlResultSet.h" using namespace std; using namespace nlohmann; diff --git a/src/replica/HttpSqlIndexModule.h b/src/replica/contr/HttpSqlIndexModule.h similarity index 97% rename from src/replica/HttpSqlIndexModule.h rename to src/replica/contr/HttpSqlIndexModule.h index dfd09f1f25..c4d7b8b469 100644 --- a/src/replica/HttpSqlIndexModule.h +++ b/src/replica/contr/HttpSqlIndexModule.h @@ -29,8 +29,8 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Common.h" -#include "replica/HttpModule.h" +#include "replica/contr/HttpModule.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpSqlSchemaModule.cc b/src/replica/contr/HttpSqlSchemaModule.cc similarity index 99% rename from src/replica/HttpSqlSchemaModule.cc rename to src/replica/contr/HttpSqlSchemaModule.cc index 42a25e5be6..caa0d0a418 100644 --- a/src/replica/HttpSqlSchemaModule.cc +++ b/src/replica/contr/HttpSqlSchemaModule.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/HttpSqlSchemaModule.h" +#include "replica/contr/HttpSqlSchemaModule.h" // System headers #include @@ -33,9 +33,9 @@ #include "css/DbInterfaceMySql.h" #include "http/Exceptions.h" #include "replica/config/Configuration.h" -#include "replica/mysql/DatabaseMySQL.h" #include "replica/jobs/SqlAlterTablesJob.h" -#include "replica/SqlResultSet.h" +#include "replica/mysql/DatabaseMySQL.h" +#include "replica/requests/SqlResultSet.h" using namespace std; using json = nlohmann::json; diff --git a/src/replica/HttpSqlSchemaModule.h b/src/replica/contr/HttpSqlSchemaModule.h similarity index 97% rename from src/replica/HttpSqlSchemaModule.h rename to src/replica/contr/HttpSqlSchemaModule.h index 2b36b91e2e..43f1d5754a 100644 --- a/src/replica/HttpSqlSchemaModule.h +++ b/src/replica/contr/HttpSqlSchemaModule.h @@ -29,8 +29,8 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Common.h" -#include "replica/HttpModule.h" +#include "replica/contr/HttpModule.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/HttpWorkerStatusModule.cc b/src/replica/contr/HttpWorkerStatusModule.cc similarity index 96% rename from src/replica/HttpWorkerStatusModule.cc rename to src/replica/contr/HttpWorkerStatusModule.cc index 411b44efe7..d7e6357808 100644 --- a/src/replica/HttpWorkerStatusModule.cc +++ b/src/replica/contr/HttpWorkerStatusModule.cc @@ -20,13 +20,13 @@ */ // Class header -#include "replica/HttpWorkerStatusModule.h" +#include "replica/contr/HttpWorkerStatusModule.h" // Qserv headers #include "http/Exceptions.h" #include "replica/config/Configuration.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" using namespace std; using json = nlohmann::json; diff --git a/src/replica/HttpWorkerStatusModule.h b/src/replica/contr/HttpWorkerStatusModule.h similarity index 96% rename from src/replica/HttpWorkerStatusModule.h rename to src/replica/contr/HttpWorkerStatusModule.h index a1b6c49b6d..f3d76a81b2 100644 --- a/src/replica/HttpWorkerStatusModule.h +++ b/src/replica/contr/HttpWorkerStatusModule.h @@ -29,8 +29,8 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/HealthMonitorTask.h" -#include "replica/HttpModule.h" +#include "replica/contr/HealthMonitorTask.h" +#include "replica/contr/HttpModule.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/ReplicationTask.cc b/src/replica/contr/ReplicationTask.cc similarity index 98% rename from src/replica/ReplicationTask.cc rename to src/replica/contr/ReplicationTask.cc index 5a0f71378b..c7dbdea2df 100644 --- a/src/replica/ReplicationTask.cc +++ b/src/replica/contr/ReplicationTask.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/ReplicationTask.h" +#include "replica/contr/ReplicationTask.h" // Qserv headers #include "replica/jobs/FindAllJob.h" diff --git a/src/replica/ReplicationTask.h b/src/replica/contr/ReplicationTask.h similarity index 99% rename from src/replica/ReplicationTask.h rename to src/replica/contr/ReplicationTask.h index b445c11dcc..2f8191e588 100644 --- a/src/replica/ReplicationTask.h +++ b/src/replica/contr/ReplicationTask.h @@ -22,7 +22,7 @@ #define LSST_QSERV_REPLICATIONTASK_H // Qserv headers -#include "replica/Task.h" +#include "replica/contr/Task.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/Task.cc b/src/replica/contr/Task.cc similarity index 98% rename from src/replica/Task.cc rename to src/replica/contr/Task.cc index 0020610ed0..4507624b48 100644 --- a/src/replica/Task.cc +++ b/src/replica/contr/Task.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/Task.h" +#include "replica/contr/Task.h" // System headers #include @@ -28,7 +28,7 @@ // Qserv headers #include "replica/jobs/QservSyncJob.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" #include "util/BlockPost.h" using namespace std; diff --git a/src/replica/Task.h b/src/replica/contr/Task.h similarity index 98% rename from src/replica/Task.h rename to src/replica/contr/Task.h index e9f077c33f..b805b32f51 100644 --- a/src/replica/Task.h +++ b/src/replica/contr/Task.h @@ -29,13 +29,13 @@ #include // Qserv headers -#include "replica/Controller.h" -#include "replica/EventLogger.h" +#include "replica/contr/Controller.h" +#include "replica/contr/EventLogger.h" #include "replica/jobs/Job.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" #include "util/BlockPost.h" #include "util/Issue.h" -#include "replica/Mutex.h" +#include "replica/util/Mutex.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/database/CMakeLists.txt b/src/replica/database/CMakeLists.txt deleted file mode 100644 index 4778e1b71a..0000000000 --- a/src/replica/database/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -add_library(replica_database OBJECT) -target_sources(replica_database PRIVATE - DatabaseServices.cc - DatabaseServicesMySQL.cc - DatabaseServicesPool.cc - TransactionContrib.cc -) -target_link_libraries(replica_database PUBLIC - log -) \ No newline at end of file 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 99% rename from src/replica/ExportClient.h rename to src/replica/export/ExportClient.h index 3eb71a0071..28142aa88c 100644 --- a/src/replica/ExportClient.h +++ b/src/replica/export/ExportClient.h @@ -31,8 +31,8 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/Common.h" -#include "replica/ProtocolBuffer.h" +#include "replica/util/Common.h" +#include "replica/util/ProtocolBuffer.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/ExportServer.cc b/src/replica/export/ExportServer.cc similarity index 97% rename from src/replica/ExportServer.cc rename to src/replica/export/ExportServer.cc index 6586787ea7..1f217bf994 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 @@ -28,7 +28,7 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/ExportServer.h b/src/replica/export/ExportServer.h similarity index 97% rename from src/replica/ExportServer.h rename to src/replica/export/ExportServer.h index be4e7bd335..2e70014514 100644 --- a/src/replica/ExportServer.h +++ b/src/replica/export/ExportServer.h @@ -33,8 +33,8 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/ExportServerConnection.h" -#include "replica/ServiceProvider.h" +#include "replica/export/ExportServerConnection.h" +#include "replica/services/ServiceProvider.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/ExportServerConnection.cc b/src/replica/export/ExportServerConnection.cc similarity index 98% rename from src/replica/ExportServerConnection.cc rename to src/replica/export/ExportServerConnection.cc index e681837cd2..63b2ff678d 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 @@ -36,12 +36,12 @@ // Qserv headers #include "global/constants.h" -#include "replica/ChunkedTable.h" #include "replica/mysql/DatabaseMySQL.h" -#include "replica/database/DatabaseServices.h" -#include "replica/FileUtils.h" -#include "replica/ReplicaInfo.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ChunkedTable.h" +#include "replica/util/FileUtils.h" +#include "replica/util/ReplicaInfo.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/ExportServerConnection.h b/src/replica/export/ExportServerConnection.h similarity index 98% rename from src/replica/ExportServerConnection.h rename to src/replica/export/ExportServerConnection.h index f577de2c76..37dcd3ba61 100644 --- a/src/replica/ExportServerConnection.h +++ b/src/replica/export/ExportServerConnection.h @@ -29,12 +29,12 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/Common.h" -#include "replica/Csv.h" #include "replica/config/Configuration.h" #include "replica/protocol.pb.h" -#include "replica/ProtocolBuffer.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Common.h" +#include "replica/util/Csv.h" +#include "replica/util/ProtocolBuffer.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/ingest/CMakeLists.txt b/src/replica/ingest/CMakeLists.txt index 9d59ea18ba..2d9d170705 100644 --- a/src/replica/ingest/CMakeLists.txt +++ b/src/replica/ingest/CMakeLists.txt @@ -11,6 +11,7 @@ target_sources(replica_ingest PRIVATE IngestResourceMgrT.cc IngestSvc.cc IngestSvcConn.cc + TransactionContrib.cc ) target_link_libraries(replica_ingest PUBLIC log diff --git a/src/replica/ingest/IngestClient.cc b/src/replica/ingest/IngestClient.cc index 432301e08d..cf1ef03a46 100644 --- a/src/replica/ingest/IngestClient.cc +++ b/src/replica/ingest/IngestClient.cc @@ -30,8 +30,8 @@ #include "boost/filesystem.hpp" // Qserv headers -#include "replica/ProtocolBuffer.h" #include "replica/protocol.pb.h" +#include "replica/util/ProtocolBuffer.h" // LSST headers #include "lsst/log/Log.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.cc b/src/replica/ingest/IngestFileSvc.cc index a1feb71d54..b950bd85fe 100644 --- a/src/replica/ingest/IngestFileSvc.cc +++ b/src/replica/ingest/IngestFileSvc.cc @@ -39,13 +39,13 @@ // Qserv headers #include "global/constants.h" #include "http/Exceptions.h" -#include "replica/ChunkedTable.h" #include "replica/mysql/DatabaseMySQL.h" #include "replica/mysql/DatabaseMySQLTypes.h" -#include "replica/database/DatabaseServices.h" -#include "replica/FileUtils.h" -#include "replica/ReplicaInfo.h" -#include "replica/Mutex.h" +#include "replica/services/DatabaseServices.h" +#include "replica/util/ChunkedTable.h" +#include "replica/util/FileUtils.h" +#include "replica/util/Mutex.h" +#include "replica/util/ReplicaInfo.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/ingest/IngestFileSvc.h b/src/replica/ingest/IngestFileSvc.h index 9d09a89a17..d10a1f864e 100644 --- a/src/replica/ingest/IngestFileSvc.h +++ b/src/replica/ingest/IngestFileSvc.h @@ -28,9 +28,9 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/Csv.h" -#include "replica/database/TransactionContrib.h" -#include "replica/ServiceProvider.h" +#include "replica/ingest/TransactionContrib.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Csv.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/ingest/IngestHttpSvc.h b/src/replica/ingest/IngestHttpSvc.h index 84f467d1fc..339744baed 100644 --- a/src/replica/ingest/IngestHttpSvc.h +++ b/src/replica/ingest/IngestHttpSvc.h @@ -27,8 +27,8 @@ #include // Qserv headers -#include "replica/HttpSvc.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/HttpSvc.h" // Forward declarations namespace lsst::qserv::replica { 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/IngestHttpSvcMod.h b/src/replica/ingest/IngestHttpSvcMod.h index ff08f380b9..7773882dae 100644 --- a/src/replica/ingest/IngestHttpSvcMod.h +++ b/src/replica/ingest/IngestHttpSvcMod.h @@ -33,7 +33,7 @@ #include "qhttp/Response.h" #include "replica/ingest/IngestRequest.h" #include "replica/ingest/IngestRequestMgr.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/ingest/IngestRequest.cc b/src/replica/ingest/IngestRequest.cc index c746497b33..e0496a1b29 100644 --- a/src/replica/ingest/IngestRequest.cc +++ b/src/replica/ingest/IngestRequest.cc @@ -37,7 +37,7 @@ #include "http/Client.h" #include "http/Exceptions.h" #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" using namespace std; namespace fs = boost::filesystem; diff --git a/src/replica/ingest/IngestRequest.h b/src/replica/ingest/IngestRequest.h index 636eab5390..db457ee71f 100644 --- a/src/replica/ingest/IngestRequest.h +++ b/src/replica/ingest/IngestRequest.h @@ -31,10 +31,10 @@ // Qserv headers #include "http/Method.h" #include "http/Url.h" -#include "replica/Csv.h" -#include "replica/database/DatabaseServices.h" #include "replica/ingest/IngestFileSvc.h" -#include "replica/Mutex.h" +#include "replica/services/DatabaseServices.h" +#include "replica/util/Csv.h" +#include "replica/util/Mutex.h" // Forward declarations diff --git a/src/replica/ingest/IngestRequestMgr.cc b/src/replica/ingest/IngestRequestMgr.cc index 0683db8e87..8fa75ac716 100644 --- a/src/replica/ingest/IngestRequestMgr.cc +++ b/src/replica/ingest/IngestRequestMgr.cc @@ -30,11 +30,11 @@ #include "boost/filesystem.hpp" // Qserv headers -#include "replica/database/DatabaseServices.h" #include "replica/ingest/IngestRequest.h" #include "replica/ingest/IngestResourceMgrP.h" #include "replica/ingest/IngestResourceMgrT.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/ingest/IngestResourceMgrP.cc b/src/replica/ingest/IngestResourceMgrP.cc index 60ac3c96e7..7fa45a2102 100644 --- a/src/replica/ingest/IngestResourceMgrP.cc +++ b/src/replica/ingest/IngestResourceMgrP.cc @@ -25,8 +25,8 @@ // Qserv headers #include "global/stringUtil.h" #include "http/Client.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" using namespace std; diff --git a/src/replica/ingest/IngestSvc.cc b/src/replica/ingest/IngestSvc.cc index 6dd085a7cd..026c0d9ccd 100644 --- a/src/replica/ingest/IngestSvc.cc +++ b/src/replica/ingest/IngestSvc.cc @@ -28,7 +28,7 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/ingest/IngestSvc.h b/src/replica/ingest/IngestSvc.h index 2c86767178..0fb622e46c 100644 --- a/src/replica/ingest/IngestSvc.h +++ b/src/replica/ingest/IngestSvc.h @@ -34,7 +34,7 @@ // Qserv headers #include "replica/ingest/IngestSvcConn.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/ingest/IngestSvcConn.cc b/src/replica/ingest/IngestSvcConn.cc index c4b4489560..9845ad5e58 100644 --- a/src/replica/ingest/IngestSvcConn.cc +++ b/src/replica/ingest/IngestSvcConn.cc @@ -39,8 +39,8 @@ #include "http/Exceptions.h" #include "http/Url.h" #include "replica/config/Configuration.h" -#include "replica/ReplicaInfo.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ReplicaInfo.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/ingest/IngestSvcConn.h b/src/replica/ingest/IngestSvcConn.h index e9abda6fbe..c5b8952ed9 100644 --- a/src/replica/ingest/IngestSvcConn.h +++ b/src/replica/ingest/IngestSvcConn.h @@ -28,12 +28,12 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/Csv.h" -#include "replica/database/DatabaseServices.h" #include "replica/ingest/IngestFileSvc.h" #include "replica/protocol.pb.h" -#include "replica/ProtocolBuffer.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Csv.h" +#include "replica/util/ProtocolBuffer.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/database/TransactionContrib.cc b/src/replica/ingest/TransactionContrib.cc similarity index 99% rename from src/replica/database/TransactionContrib.cc rename to src/replica/ingest/TransactionContrib.cc index ce9bc351e3..e623af074d 100644 --- a/src/replica/database/TransactionContrib.cc +++ b/src/replica/ingest/TransactionContrib.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/database/TransactionContrib.h" +#include "replica/ingest/TransactionContrib.h" // System headers #include diff --git a/src/replica/database/TransactionContrib.h b/src/replica/ingest/TransactionContrib.h similarity index 99% rename from src/replica/database/TransactionContrib.h rename to src/replica/ingest/TransactionContrib.h index 387ed2c208..07806ac9c0 100644 --- a/src/replica/database/TransactionContrib.h +++ b/src/replica/ingest/TransactionContrib.h @@ -34,8 +34,8 @@ // Qserv headers #include "http/Method.h" -#include "replica/Common.h" -#include "replica/Csv.h" +#include "replica/util/Common.h" +#include "replica/util/Csv.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/AbortTransactionJob.cc b/src/replica/jobs/AbortTransactionJob.cc index 627d7c807a..61a357d735 100644 --- a/src/replica/jobs/AbortTransactionJob.cc +++ b/src/replica/jobs/AbortTransactionJob.cc @@ -28,8 +28,8 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/AbortTransactionJob.h b/src/replica/jobs/AbortTransactionJob.h index f19f2fb8db..d07832c51d 100644 --- a/src/replica/jobs/AbortTransactionJob.h +++ b/src/replica/jobs/AbortTransactionJob.h @@ -29,7 +29,7 @@ #include // Qserv headers -#include "replica/Controller.h" +#include "replica/contr/Controller.h" #include "replica/jobs/SqlDeleteTablePartitionJob.h" #include "replica/jobs/SqlJobResult.h" diff --git a/src/replica/jobs/ClusterHealthJob.cc b/src/replica/jobs/ClusterHealthJob.cc index 4945d0dce8..3d5dc01ac9 100644 --- a/src/replica/jobs/ClusterHealthJob.cc +++ b/src/replica/jobs/ClusterHealthJob.cc @@ -27,9 +27,9 @@ #include // Qserv headers -#include "replica/Controller.h" +#include "replica/contr/Controller.h" #include "replica/qserv/QservMgtServices.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/CreateReplicaJob.cc b/src/replica/jobs/CreateReplicaJob.cc index 61ba52bd4c..410e975074 100644 --- a/src/replica/jobs/CreateReplicaJob.cc +++ b/src/replica/jobs/CreateReplicaJob.cc @@ -28,11 +28,11 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ErrorReporting.h" #include "replica/qserv/QservMgtServices.h" #include "replica/requests/StopRequest.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ErrorReporting.h" #include "util/String.h" // LSST headers diff --git a/src/replica/jobs/CreateReplicaJob.h b/src/replica/jobs/CreateReplicaJob.h index 92f3522271..3ed538cdb9 100644 --- a/src/replica/jobs/CreateReplicaJob.h +++ b/src/replica/jobs/CreateReplicaJob.h @@ -29,10 +29,10 @@ #include // Qserv headers -#include "replica/qserv/AddReplicaQservMgtRequest.h" #include "replica/jobs/Job.h" -#include "replica/ReplicaInfo.h" +#include "replica/qserv/AddReplicaQservMgtRequest.h" #include "replica/requests/ReplicationRequest.h" +#include "replica/util/ReplicaInfo.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/DeleteReplicaJob.cc b/src/replica/jobs/DeleteReplicaJob.cc index d9165ab512..e9ab9a94ad 100644 --- a/src/replica/jobs/DeleteReplicaJob.cc +++ b/src/replica/jobs/DeleteReplicaJob.cc @@ -28,11 +28,11 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ErrorReporting.h" #include "replica/qserv/QservMgtServices.h" #include "replica/requests/StopRequest.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ErrorReporting.h" #include "util/String.h" // LSST headers diff --git a/src/replica/jobs/DeleteReplicaJob.h b/src/replica/jobs/DeleteReplicaJob.h index 9055e93a4f..e1f337676a 100644 --- a/src/replica/jobs/DeleteReplicaJob.h +++ b/src/replica/jobs/DeleteReplicaJob.h @@ -31,8 +31,8 @@ // Qserv headers #include "replica/jobs/Job.h" #include "replica/qserv/RemoveReplicaQservMgtRequest.h" -#include "replica/ReplicaInfo.h" #include "replica/requests/DeleteRequest.h" +#include "replica/util/ReplicaInfo.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/DeleteWorkerJob.cc b/src/replica/jobs/DeleteWorkerJob.cc index af766860fe..2868cdce41 100644 --- a/src/replica/jobs/DeleteWorkerJob.cc +++ b/src/replica/jobs/DeleteWorkerJob.cc @@ -29,11 +29,11 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ErrorReporting.h" #include "replica/requests/ServiceManagementRequest.h" #include "replica/requests/StopRequest.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ErrorReporting.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/DeleteWorkerJob.h b/src/replica/jobs/DeleteWorkerJob.h index c6df77701a..8ced263107 100644 --- a/src/replica/jobs/DeleteWorkerJob.h +++ b/src/replica/jobs/DeleteWorkerJob.h @@ -30,8 +30,8 @@ // Qserv headers #include "replica/jobs/Job.h" #include "replica/jobs/ReplicateJob.h" -#include "replica/ReplicaInfo.h" #include "replica/requests/FindAllRequest.h" +#include "replica/util/ReplicaInfo.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/DirectorIndexJob.cc b/src/replica/jobs/DirectorIndexJob.cc index 76d4d4fd02..eeb044a56a 100644 --- a/src/replica/jobs/DirectorIndexJob.cc +++ b/src/replica/jobs/DirectorIndexJob.cc @@ -32,11 +32,11 @@ // Qserv headers #include "global/constants.h" -#include "replica/Common.h" #include "replica/config/Configuration.h" #include "replica/mysql/DatabaseMySQL.h" #include "replica/requests/StopRequest.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Common.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/DirectorIndexJob.h b/src/replica/jobs/DirectorIndexJob.h index 3573e271d2..76040bcc12 100644 --- a/src/replica/jobs/DirectorIndexJob.h +++ b/src/replica/jobs/DirectorIndexJob.h @@ -37,9 +37,9 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Common.h" #include "replica/jobs/Job.h" #include "replica/requests/DirectorIndexRequest.h" +#include "replica/util/Common.h" // Forward declarations namespace lsst::qserv::replica::database::mysql { diff --git a/src/replica/jobs/FindAllJob.cc b/src/replica/jobs/FindAllJob.cc index 85dcadc006..2591fd9f11 100644 --- a/src/replica/jobs/FindAllJob.cc +++ b/src/replica/jobs/FindAllJob.cc @@ -28,7 +28,7 @@ // Qserv headers #include "replica/config/Configuration.h" #include "replica/requests/StopRequest.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/FindAllJob.h b/src/replica/jobs/FindAllJob.h index 667e982616..2fb6005b3d 100644 --- a/src/replica/jobs/FindAllJob.h +++ b/src/replica/jobs/FindAllJob.h @@ -29,9 +29,9 @@ // Qserv headers #include "replica/jobs/Job.h" -#include "replica/ReplicaInfo.h" #include "replica/requests/FindAllRequest.h" -#include "replica/SemanticMaps.h" +#include "replica/util/ReplicaInfo.h" +#include "replica/util/SemanticMaps.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/FixUpJob.cc b/src/replica/jobs/FixUpJob.cc index 3b901d6332..6be4e18548 100644 --- a/src/replica/jobs/FixUpJob.cc +++ b/src/replica/jobs/FixUpJob.cc @@ -29,7 +29,7 @@ // Qserv headers #include "replica/config/Configuration.h" #include "replica/requests/StopRequest.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/FixUpJob.h b/src/replica/jobs/FixUpJob.h index 8210e6e2c9..18920e601b 100644 --- a/src/replica/jobs/FixUpJob.h +++ b/src/replica/jobs/FixUpJob.h @@ -33,7 +33,7 @@ #include "replica/jobs/Job.h" #include "replica/jobs/FindAllJob.h" #include "replica/requests/ReplicationRequest.h" -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/Job.cc b/src/replica/jobs/Job.cc index d94b8c24fe..84c268ebe3 100644 --- a/src/replica/jobs/Job.cc +++ b/src/replica/jobs/Job.cc @@ -32,11 +32,11 @@ #include "boost/date_time/posix_time/posix_time.hpp" // Qserv headers -#include "replica/Common.h" // Generators::uniqueId() #include "replica/config/Configuration.h" -#include "replica/database/DatabaseServices.h" #include "replica/qserv/QservMgtServices.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Common.h" // Generators::uniqueId() #include "util/TimeUtils.h" // LSST headers diff --git a/src/replica/jobs/Job.h b/src/replica/jobs/Job.h index b3f43f613e..117f460e7c 100644 --- a/src/replica/jobs/Job.h +++ b/src/replica/jobs/Job.h @@ -37,9 +37,9 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Controller.h" -#include "replica/ServiceProvider.h" -#include "replica/Mutex.h" +#include "replica/contr/Controller.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Mutex.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/MoveReplicaJob.h b/src/replica/jobs/MoveReplicaJob.h index 19c0ecc866..8b654d3a58 100644 --- a/src/replica/jobs/MoveReplicaJob.h +++ b/src/replica/jobs/MoveReplicaJob.h @@ -32,7 +32,7 @@ #include "replica/jobs/Job.h" #include "replica/jobs/CreateReplicaJob.h" #include "replica/jobs/DeleteReplicaJob.h" -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/PurgeJob.cc b/src/replica/jobs/PurgeJob.cc index 404b56d2a2..8137866e08 100644 --- a/src/replica/jobs/PurgeJob.cc +++ b/src/replica/jobs/PurgeJob.cc @@ -29,7 +29,7 @@ // Qserv headers #include "replica/config/Configuration.h" #include "replica/requests/StopRequest.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/PurgeJob.h b/src/replica/jobs/PurgeJob.h index e8825708e4..38632bb5aa 100644 --- a/src/replica/jobs/PurgeJob.h +++ b/src/replica/jobs/PurgeJob.h @@ -32,7 +32,7 @@ // Qserv headers #include "replica/jobs/DeleteReplicaJob.h" #include "replica/jobs/FindAllJob.h" -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/QservGetReplicasJob.cc b/src/replica/jobs/QservGetReplicasJob.cc index 25f491eed7..213435682c 100644 --- a/src/replica/jobs/QservGetReplicasJob.cc +++ b/src/replica/jobs/QservGetReplicasJob.cc @@ -28,7 +28,7 @@ // Qserv headers #include "replica/config/Configuration.h" #include "replica/qserv/QservMgtServices.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/QservGetReplicasJob.h b/src/replica/jobs/QservGetReplicasJob.h index efba3656e7..e49b30402f 100644 --- a/src/replica/jobs/QservGetReplicasJob.h +++ b/src/replica/jobs/QservGetReplicasJob.h @@ -28,10 +28,10 @@ #include // Qserv headers -#include "replica/qserv/GetReplicasQservMgtRequest.h" #include "replica/jobs/Job.h" -#include "replica/ReplicaInfo.h" -#include "replica/SemanticMaps.h" +#include "replica/qserv/GetReplicasQservMgtRequest.h" +#include "replica/util/ReplicaInfo.h" +#include "replica/util/SemanticMaps.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/QservStatusJob.cc b/src/replica/jobs/QservStatusJob.cc index cbde925173..7e5e0105be 100644 --- a/src/replica/jobs/QservStatusJob.cc +++ b/src/replica/jobs/QservStatusJob.cc @@ -28,9 +28,9 @@ // Qserv headers #include "lsst/log/Log.h" -#include "replica/Controller.h" +#include "replica/contr/Controller.h" #include "replica/qserv/QservMgtServices.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" using namespace nlohmann; using namespace std; diff --git a/src/replica/jobs/QservSyncJob.cc b/src/replica/jobs/QservSyncJob.cc index ea3c1d63e9..c8c354272a 100644 --- a/src/replica/jobs/QservSyncJob.cc +++ b/src/replica/jobs/QservSyncJob.cc @@ -28,9 +28,9 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/database/DatabaseServices.h" +#include "replica/services/DatabaseServices.h" #include "replica/qserv/QservMgtServices.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/RebalanceJob.cc b/src/replica/jobs/RebalanceJob.cc index 95d84721d5..cee7756dff 100644 --- a/src/replica/jobs/RebalanceJob.cc +++ b/src/replica/jobs/RebalanceJob.cc @@ -29,9 +29,9 @@ #include // Qserv headers -#include "replica/Common.h" -#include "replica/ErrorReporting.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Common.h" +#include "replica/util/ErrorReporting.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/RebalanceJob.h b/src/replica/jobs/RebalanceJob.h index 239db01ecd..5520163ceb 100644 --- a/src/replica/jobs/RebalanceJob.h +++ b/src/replica/jobs/RebalanceJob.h @@ -30,8 +30,8 @@ // Qserv headers #include "replica/jobs/Job.h" #include "replica/jobs/FindAllJob.h" -#include "replica/ReplicaInfo.h" #include "replica/jobs/MoveReplicaJob.h" +#include "replica/util/ReplicaInfo.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/ReplicateJob.cc b/src/replica/jobs/ReplicateJob.cc index 568aa09dec..e7ed9e020e 100644 --- a/src/replica/jobs/ReplicateJob.cc +++ b/src/replica/jobs/ReplicateJob.cc @@ -30,8 +30,8 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ErrorReporting.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ErrorReporting.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/ReplicateJob.h b/src/replica/jobs/ReplicateJob.h index 2883e2cede..3b86658431 100644 --- a/src/replica/jobs/ReplicateJob.h +++ b/src/replica/jobs/ReplicateJob.h @@ -31,7 +31,7 @@ #include "replica/jobs/CreateReplicaJob.h" #include "replica/jobs/Job.h" #include "replica/jobs/FindAllJob.h" -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/ServiceManagementJob.h b/src/replica/jobs/ServiceManagementJob.h index aae48e5368..7b57b755e3 100644 --- a/src/replica/jobs/ServiceManagementJob.h +++ b/src/replica/jobs/ServiceManagementJob.h @@ -29,10 +29,10 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/Controller.h" +#include "replica/contr/Controller.h" #include "replica/jobs/Job.h" #include "replica/requests/ServiceManagementRequest.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/SqlAlterTablesJob.h b/src/replica/jobs/SqlAlterTablesJob.h index f212e5b490..0e1d62d4c9 100644 --- a/src/replica/jobs/SqlAlterTablesJob.h +++ b/src/replica/jobs/SqlAlterTablesJob.h @@ -30,8 +30,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/jobs/SqlJob.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/SqlCreateDbJob.cc b/src/replica/jobs/SqlCreateDbJob.cc index 618cdb5f4c..61befd54d4 100644 --- a/src/replica/jobs/SqlCreateDbJob.cc +++ b/src/replica/jobs/SqlCreateDbJob.cc @@ -28,9 +28,9 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" #include "replica/requests/SqlCreateDbRequest.h" #include "replica/requests/StopRequest.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/SqlCreateIndexesJob.h b/src/replica/jobs/SqlCreateIndexesJob.h index db9453fe11..140c92c1c0 100644 --- a/src/replica/jobs/SqlCreateIndexesJob.h +++ b/src/replica/jobs/SqlCreateIndexesJob.h @@ -30,8 +30,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/jobs/SqlJob.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/SqlCreateTableJob.cc b/src/replica/jobs/SqlCreateTableJob.cc index 79f54ab14d..625e85f77f 100644 --- a/src/replica/jobs/SqlCreateTableJob.cc +++ b/src/replica/jobs/SqlCreateTableJob.cc @@ -28,9 +28,9 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" #include "replica/requests/SqlCreateTableRequest.h" #include "replica/requests/StopRequest.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/SqlCreateTableJob.h b/src/replica/jobs/SqlCreateTableJob.h index b76062f176..c066e9a37a 100644 --- a/src/replica/jobs/SqlCreateTableJob.h +++ b/src/replica/jobs/SqlCreateTableJob.h @@ -29,8 +29,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/jobs/SqlJob.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/SqlCreateTablesJob.h b/src/replica/jobs/SqlCreateTablesJob.h index 7849778ebc..fdd2f686f8 100644 --- a/src/replica/jobs/SqlCreateTablesJob.h +++ b/src/replica/jobs/SqlCreateTablesJob.h @@ -30,8 +30,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/jobs/SqlJob.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/SqlDeleteDbJob.cc b/src/replica/jobs/SqlDeleteDbJob.cc index 594f1f3178..30f84c2841 100644 --- a/src/replica/jobs/SqlDeleteDbJob.cc +++ b/src/replica/jobs/SqlDeleteDbJob.cc @@ -28,9 +28,9 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" #include "replica/requests/SqlDeleteDbRequest.h" #include "replica/requests/StopRequest.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/SqlDeleteTablePartitionJob.cc b/src/replica/jobs/SqlDeleteTablePartitionJob.cc index 69fc97316b..26b7728a28 100644 --- a/src/replica/jobs/SqlDeleteTablePartitionJob.cc +++ b/src/replica/jobs/SqlDeleteTablePartitionJob.cc @@ -23,11 +23,11 @@ #include "replica/jobs/SqlDeleteTablePartitionJob.h" // Qserv headers -#include "replica/Controller.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ServiceProvider.h" +#include "replica/contr/Controller.h" #include "replica/requests/SqlDeleteTablePartitionRequest.h" #include "replica/requests/StopRequest.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/SqlDeleteTablePartitionJob.h b/src/replica/jobs/SqlDeleteTablePartitionJob.h index 110f429222..63620ac588 100644 --- a/src/replica/jobs/SqlDeleteTablePartitionJob.h +++ b/src/replica/jobs/SqlDeleteTablePartitionJob.h @@ -30,8 +30,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/jobs/SqlJob.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/SqlDisableDbJob.cc b/src/replica/jobs/SqlDisableDbJob.cc index f8df1cbb4f..eb6712e6d3 100644 --- a/src/replica/jobs/SqlDisableDbJob.cc +++ b/src/replica/jobs/SqlDisableDbJob.cc @@ -28,9 +28,9 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" #include "replica/requests/SqlDisableDbRequest.h" #include "replica/requests/StopRequest.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/SqlDropIndexesJob.h b/src/replica/jobs/SqlDropIndexesJob.h index 57897efab8..bf8aea55d6 100644 --- a/src/replica/jobs/SqlDropIndexesJob.h +++ b/src/replica/jobs/SqlDropIndexesJob.h @@ -30,8 +30,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/jobs/SqlJob.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/SqlEnableDbJob.cc b/src/replica/jobs/SqlEnableDbJob.cc index bf24de91a9..06e5489789 100644 --- a/src/replica/jobs/SqlEnableDbJob.cc +++ b/src/replica/jobs/SqlEnableDbJob.cc @@ -28,9 +28,9 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" #include "replica/requests/SqlEnableDbRequest.h" #include "replica/requests/StopRequest.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/SqlGetIndexesJob.h b/src/replica/jobs/SqlGetIndexesJob.h index 33911e1ab5..160b035b5e 100644 --- a/src/replica/jobs/SqlGetIndexesJob.h +++ b/src/replica/jobs/SqlGetIndexesJob.h @@ -31,8 +31,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/jobs/SqlJob.h" +#include "replica/util/Common.h" // Third party headers #include "nlohmann/json.hpp" diff --git a/src/replica/jobs/SqlGrantAccessJob.cc b/src/replica/jobs/SqlGrantAccessJob.cc index 058bc74700..220fed935a 100644 --- a/src/replica/jobs/SqlGrantAccessJob.cc +++ b/src/replica/jobs/SqlGrantAccessJob.cc @@ -28,9 +28,9 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" #include "replica/requests/SqlGrantAccessRequest.h" #include "replica/requests/StopRequest.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/SqlJob.cc b/src/replica/jobs/SqlJob.cc index 7e2142698d..7523cfa083 100644 --- a/src/replica/jobs/SqlJob.cc +++ b/src/replica/jobs/SqlJob.cc @@ -28,13 +28,13 @@ // Qserv headers #include "global/constants.h" -#include "replica/ChunkedTable.h" #include "replica/config/Configuration.h" -#include "replica/Controller.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ReplicaInfo.h" +#include "replica/contr/Controller.h" #include "replica/requests/StopRequest.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ChunkedTable.h" +#include "replica/util/ReplicaInfo.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/SqlJob.h b/src/replica/jobs/SqlJob.h index f0c1359e00..f91338391d 100644 --- a/src/replica/jobs/SqlJob.h +++ b/src/replica/jobs/SqlJob.h @@ -33,7 +33,7 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Controller.h" +#include "replica/contr/Controller.h" #include "replica/jobs/Job.h" #include "replica/jobs/SqlJobResult.h" #include "replica/requests/SqlRequest.h" diff --git a/src/replica/jobs/SqlJobResult.cc b/src/replica/jobs/SqlJobResult.cc index 2a1dc3fe40..aed750fed0 100644 --- a/src/replica/jobs/SqlJobResult.cc +++ b/src/replica/jobs/SqlJobResult.cc @@ -23,7 +23,7 @@ #include "replica/jobs/SqlJobResult.h" // Qserv headers -#include "replica/Common.h" +#include "replica/util/Common.h" // System headers #include diff --git a/src/replica/jobs/SqlJobResult.h b/src/replica/jobs/SqlJobResult.h index 6dc7d326be..f1b2adcce8 100644 --- a/src/replica/jobs/SqlJobResult.h +++ b/src/replica/jobs/SqlJobResult.h @@ -28,7 +28,7 @@ #include // Qserv headers -#include "replica/SqlResultSet.h" +#include "replica/requests/SqlResultSet.h" #include "util/TablePrinter.h" // Third party headers diff --git a/src/replica/jobs/SqlQueryJob.cc b/src/replica/jobs/SqlQueryJob.cc index feeb51f58a..dbbf8269dc 100644 --- a/src/replica/jobs/SqlQueryJob.cc +++ b/src/replica/jobs/SqlQueryJob.cc @@ -28,9 +28,9 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" #include "replica/requests/SqlQueryRequest.h" #include "replica/requests/StopRequest.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/jobs/SqlRowStatsJob.cc b/src/replica/jobs/SqlRowStatsJob.cc index 6e0f61e360..70ca770303 100644 --- a/src/replica/jobs/SqlRowStatsJob.cc +++ b/src/replica/jobs/SqlRowStatsJob.cc @@ -25,10 +25,10 @@ // Qserv headers #include "global/constants.h" #include "global/stringUtil.h" -#include "replica/ChunkedTable.h" #include "replica/jobs/SqlJobResult.h" #include "replica/requests/SqlRowStatsRequest.h" #include "replica/requests/StopRequest.h" +#include "replica/util/ChunkedTable.h" #include "util/TimeUtils.h" // LSST headers diff --git a/src/replica/jobs/SqlRowStatsJob.h b/src/replica/jobs/SqlRowStatsJob.h index 6f81cddacb..d95ab80b14 100644 --- a/src/replica/jobs/SqlRowStatsJob.h +++ b/src/replica/jobs/SqlRowStatsJob.h @@ -31,8 +31,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/jobs/SqlJob.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/jobs/VerifyJob.cc b/src/replica/jobs/VerifyJob.cc index f311f868d8..c58c2abb7c 100644 --- a/src/replica/jobs/VerifyJob.cc +++ b/src/replica/jobs/VerifyJob.cc @@ -27,9 +27,9 @@ #include // Qserv headers -#include "replica/database/DatabaseServices.h" #include "replica/requests/StopRequest.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" // LSST header #include "lsst/log/Log.h" diff --git a/src/replica/mysql/DatabaseMySQL.cc b/src/replica/mysql/DatabaseMySQL.cc index 7c8ade9ccd..25ef680cc0 100644 --- a/src/replica/mysql/DatabaseMySQL.cc +++ b/src/replica/mysql/DatabaseMySQL.cc @@ -34,8 +34,8 @@ #include "replica/config/Configuration.h" #include "replica/mysql/DatabaseMySQLGenerator.h" #include "replica/mysql/DatabaseMySQLUtils.h" -#include "replica/Performance.h" #include "replica/protocol.pb.h" +#include "replica/util/Performance.h" #include "util/BlockPost.h" #include "util/TimeUtils.h" diff --git a/src/replica/mysql/DatabaseMySQL.h b/src/replica/mysql/DatabaseMySQL.h index 353185d88b..3ea0776f00 100644 --- a/src/replica/mysql/DatabaseMySQL.h +++ b/src/replica/mysql/DatabaseMySQL.h @@ -54,11 +54,11 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/mysql/DatabaseMySQLExceptions.h" #include "replica/mysql/DatabaseMySQLRow.h" #include "replica/mysql/DatabaseMySQLTypes.h" -#include "replica/Mutex.h" +#include "replica/util/Common.h" +#include "replica/util/Mutex.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/mysql/DatabaseMySQLGenerator.h b/src/replica/mysql/DatabaseMySQLGenerator.h index 30bbee33e2..963ffef36f 100644 --- a/src/replica/mysql/DatabaseMySQLGenerator.h +++ b/src/replica/mysql/DatabaseMySQLGenerator.h @@ -28,8 +28,8 @@ #include // Qserv headers -#include "replica/Common.h" -#include "replica/Csv.h" +#include "replica/util/Common.h" +#include "replica/util/Csv.h" // Forward declarations namespace lsst::qserv::replica::database::mysql { diff --git a/src/replica/mysql/DatabaseMySQLTypes.cc b/src/replica/mysql/DatabaseMySQLTypes.cc index 41a5159c3a..5994e02d24 100644 --- a/src/replica/mysql/DatabaseMySQLTypes.cc +++ b/src/replica/mysql/DatabaseMySQLTypes.cc @@ -29,7 +29,7 @@ #include // Qserv headers -#include "replica/FileUtils.h" +#include "replica/util/FileUtils.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/mysql/DatabaseMySQLTypes.h b/src/replica/mysql/DatabaseMySQLTypes.h index 7ef879553a..584211cbf2 100644 --- a/src/replica/mysql/DatabaseMySQLTypes.h +++ b/src/replica/mysql/DatabaseMySQLTypes.h @@ -31,7 +31,7 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/FileUtils.h" +#include "replica/util/FileUtils.h" // This header declarations namespace lsst::qserv::replica::database::mysql { diff --git a/src/replica/mysql/DatabaseMySQLUtils.h b/src/replica/mysql/DatabaseMySQLUtils.h index d06feea1a2..050df2b8a3 100644 --- a/src/replica/mysql/DatabaseMySQLUtils.h +++ b/src/replica/mysql/DatabaseMySQLUtils.h @@ -30,8 +30,8 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Common.h" #include "replica/mysql/DatabaseMySQLRow.h" +#include "replica/util/Common.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/qserv/GetReplicasQservMgtRequest.cc b/src/replica/qserv/GetReplicasQservMgtRequest.cc index cd5b4d9497..e0d6458b31 100644 --- a/src/replica/qserv/GetReplicasQservMgtRequest.cc +++ b/src/replica/qserv/GetReplicasQservMgtRequest.cc @@ -27,9 +27,9 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Common.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/qserv/GetReplicasQservMgtRequest.h b/src/replica/qserv/GetReplicasQservMgtRequest.h index a6d7e3e806..4d1f987440 100644 --- a/src/replica/qserv/GetReplicasQservMgtRequest.h +++ b/src/replica/qserv/GetReplicasQservMgtRequest.h @@ -32,7 +32,7 @@ // Qserv headers #include "replica/qserv/QservWorkerMgtRequest.h" -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" namespace lsst::qserv::replica { class ServiceProvider; diff --git a/src/replica/qserv/QservCzarMgtRequest.cc b/src/replica/qserv/QservCzarMgtRequest.cc index 3b762a66c4..0fbc7da9e4 100644 --- a/src/replica/qserv/QservCzarMgtRequest.cc +++ b/src/replica/qserv/QservCzarMgtRequest.cc @@ -27,7 +27,7 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" using namespace std; diff --git a/src/replica/qserv/QservMgtRequest.cc b/src/replica/qserv/QservMgtRequest.cc index 3872ae6d18..12569815b6 100644 --- a/src/replica/qserv/QservMgtRequest.cc +++ b/src/replica/qserv/QservMgtRequest.cc @@ -29,7 +29,7 @@ // Qserv headers #include "http/MetaModule.h" #include "replica/config/Configuration.h" -#include "replica/Common.h" +#include "replica/util/Common.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/qserv/QservMgtRequest.h b/src/replica/qserv/QservMgtRequest.h index 8ca26c1472..1b63dbd47d 100644 --- a/src/replica/qserv/QservMgtRequest.h +++ b/src/replica/qserv/QservMgtRequest.h @@ -36,9 +36,9 @@ // Qserv headers #include "http/AsyncReq.h" #include "http/Method.h" -#include "replica/Mutex.h" -#include "replica/Performance.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Mutex.h" +#include "replica/util/Performance.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/qserv/QservMgtServices.h b/src/replica/qserv/QservMgtServices.h index e57ede2c5f..f99651255b 100644 --- a/src/replica/qserv/QservMgtServices.h +++ b/src/replica/qserv/QservMgtServices.h @@ -40,7 +40,7 @@ #include "replica/qserv/RemoveReplicaQservMgtRequest.h" #include "replica/qserv/SetReplicasQservMgtRequest.h" #include "replica/qserv/TestEchoQservMgtRequest.h" -#include "replica/Mutex.h" +#include "replica/util/Mutex.h" #include "wbase/TaskState.h" // Forward declarations diff --git a/src/replica/qserv/QservWorkerMgtRequest.cc b/src/replica/qserv/QservWorkerMgtRequest.cc index 4d6107e7d0..53dd9438d3 100644 --- a/src/replica/qserv/QservWorkerMgtRequest.cc +++ b/src/replica/qserv/QservWorkerMgtRequest.cc @@ -27,8 +27,8 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" using namespace std; diff --git a/src/replica/qserv/RemoveReplicaQservMgtRequest.cc b/src/replica/qserv/RemoveReplicaQservMgtRequest.cc index 72e02558ef..b79e1f6a15 100644 --- a/src/replica/qserv/RemoveReplicaQservMgtRequest.cc +++ b/src/replica/qserv/RemoveReplicaQservMgtRequest.cc @@ -24,7 +24,7 @@ // Qserv headers #include "http/Method.h" -#include "replica/Common.h" +#include "replica/util/Common.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/qserv/SetReplicasQservMgtRequest.cc b/src/replica/qserv/SetReplicasQservMgtRequest.cc index 7ae372ca3a..1986f60b51 100644 --- a/src/replica/qserv/SetReplicasQservMgtRequest.cc +++ b/src/replica/qserv/SetReplicasQservMgtRequest.cc @@ -28,9 +28,9 @@ // Qserv headers #include "http/Method.h" -#include "replica/Common.h" #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Common.h" #include "util/String.h" // LSST headers diff --git a/src/replica/qserv/SetReplicasQservMgtRequest.h b/src/replica/qserv/SetReplicasQservMgtRequest.h index dc2b5fade3..0ed26188b5 100644 --- a/src/replica/qserv/SetReplicasQservMgtRequest.h +++ b/src/replica/qserv/SetReplicasQservMgtRequest.h @@ -30,7 +30,7 @@ // Qserv headers #include "replica/qserv/QservWorkerMgtRequest.h" -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" namespace lsst::qserv::replica { class ServiceProvider; 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/registry/Registry.h b/src/replica/registry/Registry.h index d5ac3bc7c0..57134b043e 100644 --- a/src/replica/registry/Registry.h +++ b/src/replica/registry/Registry.h @@ -33,7 +33,7 @@ #include "http/Method.h" #include "replica/config/ConfigCzar.h" #include "replica/config/ConfigWorker.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/registry/RegistryHttpSvc.h b/src/replica/registry/RegistryHttpSvc.h index 015c6df91c..fec673a940 100644 --- a/src/replica/registry/RegistryHttpSvc.h +++ b/src/replica/registry/RegistryHttpSvc.h @@ -26,8 +26,8 @@ #include // Qserv headers -#include "replica/HttpSvc.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/HttpSvc.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/registry/RegistryHttpSvcMod.h b/src/replica/registry/RegistryHttpSvcMod.h index 9eaabdbc93..1bf0051ae5 100644 --- a/src/replica/registry/RegistryHttpSvcMod.h +++ b/src/replica/registry/RegistryHttpSvcMod.h @@ -31,7 +31,7 @@ #include "http/ModuleBase.h" #include "qhttp/Request.h" #include "qhttp/Response.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/registry/RegistryServices.h b/src/replica/registry/RegistryServices.h index a4ce876393..cf994d208f 100644 --- a/src/replica/registry/RegistryServices.h +++ b/src/replica/registry/RegistryServices.h @@ -28,7 +28,7 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Mutex.h" +#include "replica/util/Mutex.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/CMakeLists.txt b/src/replica/requests/CMakeLists.txt index 48b98b95b3..b5eb1ea150 100644 --- a/src/replica/requests/CMakeLists.txt +++ b/src/replica/requests/CMakeLists.txt @@ -30,6 +30,7 @@ target_sources(replica_requests PRIVATE SqlQueryRequest.cc SqlRemoveTablePartitionsRequest.cc SqlRequest.cc + SqlResultSet.cc SqlRowStatsRequest.cc StatusRequest.cc StatusRequestBase.cc diff --git a/src/replica/requests/DeleteRequest.cc b/src/replica/requests/DeleteRequest.cc index 3b4a66f596..33fffd88f8 100644 --- a/src/replica/requests/DeleteRequest.cc +++ b/src/replica/requests/DeleteRequest.cc @@ -31,11 +31,11 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/Controller.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ProtocolBuffer.h" +#include "replica/contr/Controller.h" #include "replica/requests/Messenger.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ProtocolBuffer.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/DeleteRequest.h b/src/replica/requests/DeleteRequest.h index 7f5f45a42a..f7d2d49727 100644 --- a/src/replica/requests/DeleteRequest.h +++ b/src/replica/requests/DeleteRequest.h @@ -27,10 +27,10 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/protocol.pb.h" -#include "replica/ReplicaInfo.h" #include "replica/requests/RequestMessenger.h" +#include "replica/util/Common.h" +#include "replica/util/ReplicaInfo.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/DirectorIndexRequest.cc b/src/replica/requests/DirectorIndexRequest.cc index 850be9c63b..4ec4a07600 100644 --- a/src/replica/requests/DirectorIndexRequest.cc +++ b/src/replica/requests/DirectorIndexRequest.cc @@ -32,11 +32,11 @@ #include "boost/filesystem.hpp" // Qserv headers -#include "replica/Controller.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ProtocolBuffer.h" +#include "replica/contr/Controller.h" #include "replica/requests/Messenger.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ProtocolBuffer.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/DirectorIndexRequest.h b/src/replica/requests/DirectorIndexRequest.h index 731143a675..f81d99b272 100644 --- a/src/replica/requests/DirectorIndexRequest.h +++ b/src/replica/requests/DirectorIndexRequest.h @@ -29,9 +29,9 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/protocol.pb.h" #include "replica/requests/RequestMessenger.h" +#include "replica/util/Common.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/DisposeRequest.cc b/src/replica/requests/DisposeRequest.cc index 60df5bcdc2..dd668d0214 100644 --- a/src/replica/requests/DisposeRequest.cc +++ b/src/replica/requests/DisposeRequest.cc @@ -27,8 +27,8 @@ #include // Qserv headers -#include "replica/ProtocolBuffer.h" #include "replica/requests/Messenger.h" +#include "replica/util/ProtocolBuffer.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/DisposeRequest.h b/src/replica/requests/DisposeRequest.h index a024546582..7f3d73d3b8 100644 --- a/src/replica/requests/DisposeRequest.h +++ b/src/replica/requests/DisposeRequest.h @@ -29,9 +29,9 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/protocol.pb.h" #include "replica/requests/RequestMessenger.h" +#include "replica/util/Common.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/EchoRequest.cc b/src/replica/requests/EchoRequest.cc index df23b7a194..b62bd8ba9c 100644 --- a/src/replica/requests/EchoRequest.cc +++ b/src/replica/requests/EchoRequest.cc @@ -30,12 +30,12 @@ #include "boost/date_time/posix_time/posix_time.hpp" // Qserv headers -#include "replica/Controller.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ProtocolBuffer.h" -#include "replica/ReplicaInfo.h" +#include "replica/contr/Controller.h" #include "replica/requests/Messenger.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ProtocolBuffer.h" +#include "replica/util/ReplicaInfo.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/EchoRequest.h b/src/replica/requests/EchoRequest.h index 3398d9cb0d..71f41da6da 100644 --- a/src/replica/requests/EchoRequest.h +++ b/src/replica/requests/EchoRequest.h @@ -28,9 +28,9 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/protocol.pb.h" #include "replica/requests/RequestMessenger.h" +#include "replica/util/Common.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/FindAllRequest.cc b/src/replica/requests/FindAllRequest.cc index 178403c34b..46d799fe2b 100644 --- a/src/replica/requests/FindAllRequest.cc +++ b/src/replica/requests/FindAllRequest.cc @@ -30,11 +30,11 @@ #include "boost/date_time/posix_time/posix_time.hpp" // Qserv headers -#include "replica/Controller.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ProtocolBuffer.h" +#include "replica/contr/Controller.h" #include "replica/requests/Messenger.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ProtocolBuffer.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/FindAllRequest.h b/src/replica/requests/FindAllRequest.h index 1c1fac0b1b..fd0424b7d0 100644 --- a/src/replica/requests/FindAllRequest.h +++ b/src/replica/requests/FindAllRequest.h @@ -27,10 +27,10 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/protocol.pb.h" -#include "replica/ReplicaInfo.h" #include "replica/requests/RequestMessenger.h" +#include "replica/util/Common.h" +#include "replica/util/ReplicaInfo.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/FindRequest.cc b/src/replica/requests/FindRequest.cc index 355e563e3d..708f7c3164 100644 --- a/src/replica/requests/FindRequest.cc +++ b/src/replica/requests/FindRequest.cc @@ -30,12 +30,12 @@ #include "boost/date_time/posix_time/posix_time.hpp" // Qserv headers -#include "replica/Controller.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ProtocolBuffer.h" -#include "replica/ReplicaInfo.h" +#include "replica/contr/Controller.h" #include "replica/requests/Messenger.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ProtocolBuffer.h" +#include "replica/util/ReplicaInfo.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/FindRequest.h b/src/replica/requests/FindRequest.h index 799a132ad5..5bfa920fe3 100644 --- a/src/replica/requests/FindRequest.h +++ b/src/replica/requests/FindRequest.h @@ -27,10 +27,10 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/protocol.pb.h" -#include "replica/ReplicaInfo.h" #include "replica/requests/RequestMessenger.h" +#include "replica/util/Common.h" +#include "replica/util/ReplicaInfo.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/Messenger.h b/src/replica/requests/Messenger.h index 8b19519b48..64d6e64179 100644 --- a/src/replica/requests/Messenger.h +++ b/src/replica/requests/Messenger.h @@ -31,9 +31,9 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/requests/MessengerConnector.h" #include "replica/protocol.pb.h" -#include "replica/Mutex.h" +#include "replica/requests/MessengerConnector.h" +#include "replica/util/Mutex.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/MessengerConnector.cc b/src/replica/requests/MessengerConnector.cc index 0c29074019..8d24584ae3 100644 --- a/src/replica/requests/MessengerConnector.cc +++ b/src/replica/requests/MessengerConnector.cc @@ -27,7 +27,7 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ProtocolBuffer.h" +#include "replica/util/ProtocolBuffer.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/MessengerConnector.h b/src/replica/requests/MessengerConnector.h index 9f754fb5c5..a8574e2af9 100644 --- a/src/replica/requests/MessengerConnector.h +++ b/src/replica/requests/MessengerConnector.h @@ -35,10 +35,10 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/MessageQueue.h" #include "replica/protocol.pb.h" -#include "replica/ProtocolBuffer.h" -#include "replica/Mutex.h" +#include "replica/util/ProtocolBuffer.h" +#include "replica/util/MessageQueue.h" +#include "replica/util/Mutex.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/ReplicationRequest.cc b/src/replica/requests/ReplicationRequest.cc index ac82c9d364..9292e53e04 100644 --- a/src/replica/requests/ReplicationRequest.cc +++ b/src/replica/requests/ReplicationRequest.cc @@ -31,11 +31,11 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/Controller.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ProtocolBuffer.h" +#include "replica/contr/Controller.h" #include "replica/requests/Messenger.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ProtocolBuffer.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/ReplicationRequest.h b/src/replica/requests/ReplicationRequest.h index caa2d2d8a8..6f650384fd 100644 --- a/src/replica/requests/ReplicationRequest.h +++ b/src/replica/requests/ReplicationRequest.h @@ -30,10 +30,10 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/Common.h" #include "replica/protocol.pb.h" -#include "replica/ReplicaInfo.h" #include "replica/requests/RequestMessenger.h" +#include "replica/util/Common.h" +#include "replica/util/ReplicaInfo.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/Request.cc b/src/replica/requests/Request.cc index 7683328afb..32f225e687 100644 --- a/src/replica/requests/Request.cc +++ b/src/replica/requests/Request.cc @@ -33,9 +33,9 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/Controller.h" -#include "replica/ProtocolBuffer.h" -#include "replica/ServiceProvider.h" +#include "replica/contr/Controller.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ProtocolBuffer.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/Request.h b/src/replica/requests/Request.h index 77b2b0e870..944464afe1 100644 --- a/src/replica/requests/Request.h +++ b/src/replica/requests/Request.h @@ -33,12 +33,12 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/Common.h" #include "replica/config/Configuration.h" -#include "replica/Performance.h" -#include "replica/ProtocolBuffer.h" -#include "replica/ServiceProvider.h" -#include "replica/Mutex.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Common.h" +#include "replica/util/Performance.h" +#include "replica/util/ProtocolBuffer.h" +#include "replica/util/Mutex.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/RequestMessenger.cc b/src/replica/requests/RequestMessenger.cc index 028fd557ef..6219d46fcf 100644 --- a/src/replica/requests/RequestMessenger.cc +++ b/src/replica/requests/RequestMessenger.cc @@ -24,7 +24,7 @@ // Qserv headers #include "replica/protocol.pb.h" -#include "replica/ProtocolBuffer.h" +#include "replica/util/ProtocolBuffer.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/RequestMessenger.h b/src/replica/requests/RequestMessenger.h index b8f2402c32..c94b677864 100644 --- a/src/replica/requests/RequestMessenger.h +++ b/src/replica/requests/RequestMessenger.h @@ -30,12 +30,12 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/Common.h" #include "replica/protocol.pb.h" -#include "replica/Mutex.h" #include "replica/requests/Messenger.h" #include "replica/requests/Request.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Common.h" +#include "replica/util/Mutex.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/RequestTracker.cc b/src/replica/requests/RequestTracker.cc index bc25e2f8db..c45688aae3 100644 --- a/src/replica/requests/RequestTracker.cc +++ b/src/replica/requests/RequestTracker.cc @@ -23,7 +23,7 @@ #include "replica/requests/RequestTracker.h" // Qserv headers -#include "replica/Controller.h" +#include "replica/contr/Controller.h" #include "util/BlockPost.h" using namespace std; diff --git a/src/replica/requests/RequestTracker.h b/src/replica/requests/RequestTracker.h index 0a5e2fd139..4379b70218 100644 --- a/src/replica/requests/RequestTracker.h +++ b/src/replica/requests/RequestTracker.h @@ -29,8 +29,8 @@ #include // Qserv headers -#include "replica/ErrorReporting.h" #include "replica/requests/Request.h" +#include "replica/util/ErrorReporting.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/ServiceManagementRequest.h b/src/replica/requests/ServiceManagementRequest.h index 94c9ba9047..d837916e67 100644 --- a/src/replica/requests/ServiceManagementRequest.h +++ b/src/replica/requests/ServiceManagementRequest.h @@ -40,9 +40,9 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/protocol.pb.h" #include "replica/requests/ServiceManagementRequestBase.h" +#include "replica/util/Common.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/ServiceManagementRequestBase.cc b/src/replica/requests/ServiceManagementRequestBase.cc index 0922c7e239..66ba833761 100644 --- a/src/replica/requests/ServiceManagementRequestBase.cc +++ b/src/replica/requests/ServiceManagementRequestBase.cc @@ -29,11 +29,11 @@ #include "boost/date_time/posix_time/posix_time.hpp" // Qserv headers -#include "replica/Controller.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ProtocolBuffer.h" +#include "replica/contr/Controller.h" #include "replica/requests/Messenger.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ProtocolBuffer.h" #include "util/TimeUtils.h" // LSST headers diff --git a/src/replica/requests/ServiceManagementRequestBase.h b/src/replica/requests/ServiceManagementRequestBase.h index e126466438..0d28ad1ce5 100644 --- a/src/replica/requests/ServiceManagementRequestBase.h +++ b/src/replica/requests/ServiceManagementRequestBase.h @@ -29,9 +29,9 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/protocol.pb.h" #include "replica/requests/RequestMessenger.h" +#include "replica/util/Common.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/SqlAlterTablesRequest.cc b/src/replica/requests/SqlAlterTablesRequest.cc index ffe28ee08c..cea86e1bac 100644 --- a/src/replica/requests/SqlAlterTablesRequest.cc +++ b/src/replica/requests/SqlAlterTablesRequest.cc @@ -23,7 +23,7 @@ #include "replica/requests/SqlAlterTablesRequest.h" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/SqlAlterTablesRequest.h b/src/replica/requests/SqlAlterTablesRequest.h index 36c17cd333..59a6ca7b18 100644 --- a/src/replica/requests/SqlAlterTablesRequest.h +++ b/src/replica/requests/SqlAlterTablesRequest.h @@ -30,8 +30,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/requests/SqlRequest.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/SqlCreateDbRequest.cc b/src/replica/requests/SqlCreateDbRequest.cc index fb0b6a3919..7f349581e2 100644 --- a/src/replica/requests/SqlCreateDbRequest.cc +++ b/src/replica/requests/SqlCreateDbRequest.cc @@ -23,7 +23,7 @@ #include "replica/requests/SqlCreateDbRequest.h" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/SqlCreateIndexesRequest.cc b/src/replica/requests/SqlCreateIndexesRequest.cc index 7b29073f61..467780dda4 100644 --- a/src/replica/requests/SqlCreateIndexesRequest.cc +++ b/src/replica/requests/SqlCreateIndexesRequest.cc @@ -23,7 +23,7 @@ #include "replica/requests/SqlCreateIndexesRequest.h" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/SqlCreateIndexesRequest.h b/src/replica/requests/SqlCreateIndexesRequest.h index 91b2558510..4a958398cb 100644 --- a/src/replica/requests/SqlCreateIndexesRequest.h +++ b/src/replica/requests/SqlCreateIndexesRequest.h @@ -30,8 +30,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/requests/SqlRequest.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/SqlCreateTableRequest.cc b/src/replica/requests/SqlCreateTableRequest.cc index ee70b96c37..475c72d0f5 100644 --- a/src/replica/requests/SqlCreateTableRequest.cc +++ b/src/replica/requests/SqlCreateTableRequest.cc @@ -23,7 +23,7 @@ #include "replica/requests/SqlCreateTableRequest.h" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/SqlCreateTableRequest.h b/src/replica/requests/SqlCreateTableRequest.h index e28dce8bb9..c8cb7ef29b 100644 --- a/src/replica/requests/SqlCreateTableRequest.h +++ b/src/replica/requests/SqlCreateTableRequest.h @@ -29,8 +29,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/requests/SqlRequest.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/SqlCreateTablesRequest.cc b/src/replica/requests/SqlCreateTablesRequest.cc index 64f016ec2a..7eb936e8c7 100644 --- a/src/replica/requests/SqlCreateTablesRequest.cc +++ b/src/replica/requests/SqlCreateTablesRequest.cc @@ -23,7 +23,7 @@ #include "replica/requests/SqlCreateTablesRequest.h" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/SqlCreateTablesRequest.h b/src/replica/requests/SqlCreateTablesRequest.h index c789e8d10c..db97aea6de 100644 --- a/src/replica/requests/SqlCreateTablesRequest.h +++ b/src/replica/requests/SqlCreateTablesRequest.h @@ -30,8 +30,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/requests/SqlRequest.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/SqlDeleteDbRequest.cc b/src/replica/requests/SqlDeleteDbRequest.cc index 4342f0f4af..3d465866b1 100644 --- a/src/replica/requests/SqlDeleteDbRequest.cc +++ b/src/replica/requests/SqlDeleteDbRequest.cc @@ -23,7 +23,7 @@ #include "replica/requests/SqlDeleteDbRequest.h" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/SqlDeleteTablePartitionRequest.cc b/src/replica/requests/SqlDeleteTablePartitionRequest.cc index b433072fbd..0ce60e1590 100644 --- a/src/replica/requests/SqlDeleteTablePartitionRequest.cc +++ b/src/replica/requests/SqlDeleteTablePartitionRequest.cc @@ -23,7 +23,7 @@ #include "replica/requests/SqlDeleteTablePartitionRequest.h" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/SqlDeleteTablePartitionRequest.h b/src/replica/requests/SqlDeleteTablePartitionRequest.h index 4c32d0b2be..7cb1676e07 100644 --- a/src/replica/requests/SqlDeleteTablePartitionRequest.h +++ b/src/replica/requests/SqlDeleteTablePartitionRequest.h @@ -29,8 +29,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/requests/SqlRequest.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/SqlDeleteTableRequest.cc b/src/replica/requests/SqlDeleteTableRequest.cc index e9203a18c1..2fd4161d73 100644 --- a/src/replica/requests/SqlDeleteTableRequest.cc +++ b/src/replica/requests/SqlDeleteTableRequest.cc @@ -23,7 +23,7 @@ #include "replica/requests/SqlDeleteTableRequest.h" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/SqlDisableDbRequest.cc b/src/replica/requests/SqlDisableDbRequest.cc index 81eb1c217e..152c8159d9 100644 --- a/src/replica/requests/SqlDisableDbRequest.cc +++ b/src/replica/requests/SqlDisableDbRequest.cc @@ -23,7 +23,7 @@ #include "replica/requests/SqlDisableDbRequest.h" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/SqlDropIndexesRequest.cc b/src/replica/requests/SqlDropIndexesRequest.cc index d5a418795c..edc6ba7916 100644 --- a/src/replica/requests/SqlDropIndexesRequest.cc +++ b/src/replica/requests/SqlDropIndexesRequest.cc @@ -23,7 +23,7 @@ #include "replica/requests/SqlDropIndexesRequest.h" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/SqlDropIndexesRequest.h b/src/replica/requests/SqlDropIndexesRequest.h index 67b38ca09f..435c293894 100644 --- a/src/replica/requests/SqlDropIndexesRequest.h +++ b/src/replica/requests/SqlDropIndexesRequest.h @@ -30,8 +30,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/requests/SqlRequest.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/SqlEnableDbRequest.cc b/src/replica/requests/SqlEnableDbRequest.cc index 2cdc86818e..061895e284 100644 --- a/src/replica/requests/SqlEnableDbRequest.cc +++ b/src/replica/requests/SqlEnableDbRequest.cc @@ -23,7 +23,7 @@ #include "replica/requests/SqlEnableDbRequest.h" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/SqlGetIndexesRequest.cc b/src/replica/requests/SqlGetIndexesRequest.cc index da2540ab3b..061e8fdd55 100644 --- a/src/replica/requests/SqlGetIndexesRequest.cc +++ b/src/replica/requests/SqlGetIndexesRequest.cc @@ -23,7 +23,7 @@ #include "replica/requests/SqlGetIndexesRequest.h" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/SqlGetIndexesRequest.h b/src/replica/requests/SqlGetIndexesRequest.h index a425d52aad..836e1375da 100644 --- a/src/replica/requests/SqlGetIndexesRequest.h +++ b/src/replica/requests/SqlGetIndexesRequest.h @@ -30,8 +30,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/requests/SqlRequest.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/SqlGrantAccessRequest.cc b/src/replica/requests/SqlGrantAccessRequest.cc index e17bb4dd15..a0e99c7748 100644 --- a/src/replica/requests/SqlGrantAccessRequest.cc +++ b/src/replica/requests/SqlGrantAccessRequest.cc @@ -23,7 +23,7 @@ #include "replica/requests/SqlGrantAccessRequest.h" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/SqlQueryRequest.cc b/src/replica/requests/SqlQueryRequest.cc index e628318a4d..fabde8fe12 100644 --- a/src/replica/requests/SqlQueryRequest.cc +++ b/src/replica/requests/SqlQueryRequest.cc @@ -23,7 +23,7 @@ #include "replica/requests/SqlQueryRequest.h" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/SqlRemoveTablePartitionsRequest.cc b/src/replica/requests/SqlRemoveTablePartitionsRequest.cc index 3020283a68..2397d3adf1 100644 --- a/src/replica/requests/SqlRemoveTablePartitionsRequest.cc +++ b/src/replica/requests/SqlRemoveTablePartitionsRequest.cc @@ -23,7 +23,7 @@ #include "replica/requests/SqlRemoveTablePartitionsRequest.h" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/SqlRequest.cc b/src/replica/requests/SqlRequest.cc index 45f1ba93a1..0dfebb129e 100644 --- a/src/replica/requests/SqlRequest.cc +++ b/src/replica/requests/SqlRequest.cc @@ -30,10 +30,10 @@ #include "boost/date_time/posix_time/posix_time.hpp" // Qserv headers -#include "replica/Controller.h" -#include "replica/database/DatabaseServices.h" +#include "replica/contr/Controller.h" #include "replica/requests/Messenger.h" -#include "replica/ServiceProvider.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" #include "util/String.h" #include "util/TimeUtils.h" diff --git a/src/replica/requests/SqlRequest.h b/src/replica/requests/SqlRequest.h index 7683bb9eee..72d0b624ce 100644 --- a/src/replica/requests/SqlRequest.h +++ b/src/replica/requests/SqlRequest.h @@ -30,10 +30,10 @@ #include // Qserv headers -#include "replica/Common.h" -#include "replica/requests/RequestMessenger.h" -#include "replica/SqlResultSet.h" #include "replica/protocol.pb.h" +#include "replica/requests/RequestMessenger.h" +#include "replica/requests/SqlResultSet.h" +#include "replica/util/Common.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/SqlResultSet.cc b/src/replica/requests/SqlResultSet.cc similarity index 99% rename from src/replica/SqlResultSet.cc rename to src/replica/requests/SqlResultSet.cc index 0dc07f8d2a..271a5031e2 100644 --- a/src/replica/SqlResultSet.cc +++ b/src/replica/requests/SqlResultSet.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/SqlResultSet.h" +#include "replica/requests/SqlResultSet.h" // System headers #include diff --git a/src/replica/SqlResultSet.h b/src/replica/requests/SqlResultSet.h similarity index 99% rename from src/replica/SqlResultSet.h rename to src/replica/requests/SqlResultSet.h index d7bc792f3c..509e0dd21f 100644 --- a/src/replica/SqlResultSet.h +++ b/src/replica/requests/SqlResultSet.h @@ -30,8 +30,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/protocol.pb.h" +#include "replica/util/Common.h" #include "util/TablePrinter.h" // Third party headers diff --git a/src/replica/requests/SqlRowStatsRequest.h b/src/replica/requests/SqlRowStatsRequest.h index f6a64fc37f..5909122223 100644 --- a/src/replica/requests/SqlRowStatsRequest.h +++ b/src/replica/requests/SqlRowStatsRequest.h @@ -30,8 +30,8 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/requests/SqlRequest.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/StatusRequest.h b/src/replica/requests/StatusRequest.h index be6385c7d1..16d02f3a5e 100644 --- a/src/replica/requests/StatusRequest.h +++ b/src/replica/requests/StatusRequest.h @@ -38,16 +38,16 @@ #include // Qserv headers -#include "replica/Common.h" -#include "replica/database/DatabaseServices.h" #include "replica/protocol.pb.h" -#include "replica/ProtocolBuffer.h" -#include "replica/ReplicaInfo.h" #include "replica/requests/Messenger.h" #include "replica/requests/RequestMessenger.h" #include "replica/requests/StatusRequestBase.h" -#include "replica/ServiceProvider.h" -#include "replica/SqlResultSet.h" +#include "replica/requests/SqlResultSet.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Common.h" +#include "replica/util/ProtocolBuffer.h" +#include "replica/util/ReplicaInfo.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/StatusRequestBase.cc b/src/replica/requests/StatusRequestBase.cc index 4b620df518..31e5aea09f 100644 --- a/src/replica/requests/StatusRequestBase.cc +++ b/src/replica/requests/StatusRequestBase.cc @@ -31,8 +31,8 @@ #include "boost/date_time/posix_time/posix_time.hpp" // Qserv headers -#include "replica/ProtocolBuffer.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ProtocolBuffer.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/StatusRequestBase.h b/src/replica/requests/StatusRequestBase.h index 178cbc6098..7064bfd92d 100644 --- a/src/replica/requests/StatusRequestBase.h +++ b/src/replica/requests/StatusRequestBase.h @@ -26,11 +26,11 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/protocol.pb.h" #include "replica/requests/Messenger.h" #include "replica/requests/RequestMessenger.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/StopRequest.h b/src/replica/requests/StopRequest.h index 17303b9db2..219c8c0fbb 100644 --- a/src/replica/requests/StopRequest.h +++ b/src/replica/requests/StopRequest.h @@ -39,16 +39,16 @@ #include // Qserv headers -#include "replica/Common.h" -#include "replica/database/DatabaseServices.h" #include "replica/protocol.pb.h" -#include "replica/ProtocolBuffer.h" -#include "replica/ReplicaInfo.h" #include "replica/requests/Messenger.h" #include "replica/requests/RequestMessenger.h" #include "replica/requests/StopRequestBase.h" -#include "replica/ServiceProvider.h" -#include "replica/SqlResultSet.h" +#include "replica/requests/SqlResultSet.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Common.h" +#include "replica/util/ProtocolBuffer.h" +#include "replica/util/ReplicaInfo.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/requests/StopRequestBase.cc b/src/replica/requests/StopRequestBase.cc index d8df2b2a00..af98582d04 100644 --- a/src/replica/requests/StopRequestBase.cc +++ b/src/replica/requests/StopRequestBase.cc @@ -31,10 +31,10 @@ #include "boost/date_time/posix_time/posix_time.hpp" // Qserv headers -#include "replica/Controller.h" -#include "replica/database/DatabaseServices.h" -#include "replica/ProtocolBuffer.h" -#include "replica/ServiceProvider.h" +#include "replica/contr/Controller.h" +#include "replica/services/DatabaseServices.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ProtocolBuffer.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/requests/StopRequestBase.h b/src/replica/requests/StopRequestBase.h index ec34a47762..31da3b5267 100644 --- a/src/replica/requests/StopRequestBase.h +++ b/src/replica/requests/StopRequestBase.h @@ -27,11 +27,11 @@ #include // Qserv headers -#include "replica/Common.h" #include "replica/protocol.pb.h" #include "replica/requests/Messenger.h" #include "replica/requests/RequestMessenger.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/services/CMakeLists.txt b/src/replica/services/CMakeLists.txt new file mode 100644 index 0000000000..7d849bec4a --- /dev/null +++ b/src/replica/services/CMakeLists.txt @@ -0,0 +1,11 @@ +add_library(replica_services OBJECT) +target_sources(replica_services PRIVATE + ChunkLocker.cc + DatabaseServices.cc + DatabaseServicesMySQL.cc + DatabaseServicesPool.cc + ServiceProvider.cc +) +target_link_libraries(replica_services PUBLIC + log +) diff --git a/src/replica/ChunkLocker.cc b/src/replica/services/ChunkLocker.cc similarity index 99% rename from src/replica/ChunkLocker.cc rename to src/replica/services/ChunkLocker.cc index 7160271614..79fcb24253 100644 --- a/src/replica/ChunkLocker.cc +++ b/src/replica/services/ChunkLocker.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/ChunkLocker.h" +#include "replica/services/ChunkLocker.h" // System headers #include diff --git a/src/replica/ChunkLocker.h b/src/replica/services/ChunkLocker.h similarity index 99% rename from src/replica/ChunkLocker.h rename to src/replica/services/ChunkLocker.h index f0c11b603e..a7114e7077 100644 --- a/src/replica/ChunkLocker.h +++ b/src/replica/services/ChunkLocker.h @@ -28,7 +28,7 @@ #include // Qserv headers -#include "replica/Mutex.h" +#include "replica/util/Mutex.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/database/DatabaseServices.cc b/src/replica/services/DatabaseServices.cc similarity index 98% rename from src/replica/database/DatabaseServices.cc rename to src/replica/services/DatabaseServices.cc index d82910b695..aca180348c 100644 --- a/src/replica/database/DatabaseServices.cc +++ b/src/replica/services/DatabaseServices.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/database/DatabaseServices.h" +#include "replica/services/DatabaseServices.h" // System headers #include @@ -28,7 +28,7 @@ // Qserv headers #include "replica/config/Configuration.h" #include "replica/mysql/DatabaseMySQL.h" -#include "replica/database/DatabaseServicesMySQL.h" +#include "replica/services/DatabaseServicesMySQL.h" #include "util/TimeUtils.h" // LSST headers diff --git a/src/replica/database/DatabaseServices.h b/src/replica/services/DatabaseServices.h similarity index 99% rename from src/replica/database/DatabaseServices.h rename to src/replica/services/DatabaseServices.h index 79eee02c4c..70b8b011b1 100644 --- a/src/replica/database/DatabaseServices.h +++ b/src/replica/services/DatabaseServices.h @@ -36,11 +36,11 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Common.h" -#include "replica/Csv.h" -#include "replica/database/TransactionContrib.h" -#include "replica/ReplicaInfo.h" -#include "replica/Mutex.h" +#include "replica/ingest/TransactionContrib.h" +#include "replica/util/Common.h" +#include "replica/util/Csv.h" +#include "replica/util/ReplicaInfo.h" +#include "replica/util/Mutex.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/database/DatabaseServicesMySQL.cc b/src/replica/services/DatabaseServicesMySQL.cc similarity index 99% rename from src/replica/database/DatabaseServicesMySQL.cc rename to src/replica/services/DatabaseServicesMySQL.cc index 74da2ac938..813e85d7cd 100644 --- a/src/replica/database/DatabaseServicesMySQL.cc +++ b/src/replica/services/DatabaseServicesMySQL.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/database/DatabaseServicesMySQL.h" +#include "replica//services/DatabaseServicesMySQL.h" // System headers #include @@ -33,16 +33,16 @@ // Qserv headers #include "global/stringUtil.h" #include "http/Method.h" -#include "replica/Common.h" #include "replica/config/Configuration.h" -#include "replica/Controller.h" +#include "replica/contr/Controller.h" #include "replica/jobs/Job.h" #include "replica/mysql/DatabaseMySQLUtils.h" -#include "replica/NamedMutexRegistry.h" #include "replica/qserv/QservWorkerMgtRequest.h" -#include "replica/ReplicaInfo.h" #include "replica/requests/Request.h" -#include "replica/SemanticMaps.h" +#include "replica/util/Common.h" +#include "replica/util/NamedMutexRegistry.h" +#include "replica/util/ReplicaInfo.h" +#include "replica/util/SemanticMaps.h" #include "util/TimeUtils.h" // LSST headers diff --git a/src/replica/database/DatabaseServicesMySQL.h b/src/replica/services/DatabaseServicesMySQL.h similarity index 99% rename from src/replica/database/DatabaseServicesMySQL.h rename to src/replica/services/DatabaseServicesMySQL.h index df9afc2300..1e6b3c31a4 100644 --- a/src/replica/database/DatabaseServicesMySQL.h +++ b/src/replica/services/DatabaseServicesMySQL.h @@ -35,8 +35,8 @@ // Qserv headers #include "replica/config/Configuration.h" #include "replica/mysql/DatabaseMySQL.h" -#include "replica/database/DatabaseServices.h" -#include "replica/Mutex.h" +#include "replica/services/DatabaseServices.h" +#include "replica/util/Mutex.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/database/DatabaseServicesPool.cc b/src/replica/services/DatabaseServicesPool.cc similarity index 99% rename from src/replica/database/DatabaseServicesPool.cc rename to src/replica/services/DatabaseServicesPool.cc index f4a9d76b12..66ed281238 100644 --- a/src/replica/database/DatabaseServicesPool.cc +++ b/src/replica/services/DatabaseServicesPool.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/database/DatabaseServicesPool.h" +#include "replica//services/DatabaseServicesPool.h" // System headers #include diff --git a/src/replica/database/DatabaseServicesPool.h b/src/replica/services/DatabaseServicesPool.h similarity index 99% rename from src/replica/database/DatabaseServicesPool.h rename to src/replica/services/DatabaseServicesPool.h index 5ec2ad9d21..a6fcb45499 100644 --- a/src/replica/database/DatabaseServicesPool.h +++ b/src/replica/services/DatabaseServicesPool.h @@ -34,8 +34,8 @@ #include // Qserv headers -#include "replica/Common.h" -#include "replica/database/DatabaseServices.h" +#include "replica/services/DatabaseServices.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/ServiceProvider.cc b/src/replica/services/ServiceProvider.cc similarity index 97% rename from src/replica/ServiceProvider.cc rename to src/replica/services/ServiceProvider.cc index 4cc7f22bb3..af4525886f 100644 --- a/src/replica/ServiceProvider.cc +++ b/src/replica/services/ServiceProvider.cc @@ -20,19 +20,18 @@ */ // Class header -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // System headers #include #include // Qserv headers -#include "replica/ChunkLocker.h" #include "replica/config/Configuration.h" -#include "replica/database/DatabaseServicesPool.h" #include "replica/qserv/QservMgtServices.h" #include "replica/registry/Registry.h" #include "replica/requests/Messenger.h" +#include "replica/services/DatabaseServicesPool.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/ServiceProvider.h b/src/replica/services/ServiceProvider.h similarity index 98% rename from src/replica/ServiceProvider.h rename to src/replica/services/ServiceProvider.h index db825b35b7..240bc2303a 100644 --- a/src/replica/ServiceProvider.h +++ b/src/replica/services/ServiceProvider.h @@ -31,9 +31,9 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/ChunkLocker.h" -#include "replica/NamedMutexRegistry.h" -#include "replica/Mutex.h" +#include "replica/services/ChunkLocker.h" +#include "replica/util/Mutex.h" +#include "replica/util/NamedMutexRegistry.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/tests/testChunkLocker.cc b/src/replica/tests/testChunkLocker.cc index a66489aedc..36b3650b81 100644 --- a/src/replica/tests/testChunkLocker.cc +++ b/src/replica/tests/testChunkLocker.cc @@ -31,7 +31,7 @@ #include "lsst/log/Log.h" // Qserv headers -#include "replica/ChunkLocker.h" +#include "replica/services/ChunkLocker.h" // Boost unit test header #define BOOST_TEST_MODULE ChunkLocker diff --git a/src/replica/tests/testChunkNumber.cc b/src/replica/tests/testChunkNumber.cc index 64f4337f0c..013ef8097d 100644 --- a/src/replica/tests/testChunkNumber.cc +++ b/src/replica/tests/testChunkNumber.cc @@ -32,7 +32,7 @@ #include "lsst/log/Log.h" // Qserv headers -#include "replica/ChunkNumber.h" +#include "replica/util/ChunkNumber.h" // Boost unit test header #define BOOST_TEST_MODULE ChunkNumber diff --git a/src/replica/tests/testChunkedTable.cc b/src/replica/tests/testChunkedTable.cc index f887c7b491..c7d7559a3c 100644 --- a/src/replica/tests/testChunkedTable.cc +++ b/src/replica/tests/testChunkedTable.cc @@ -23,7 +23,7 @@ #include "lsst/log/Log.h" // Qserv headers -#include "replica/ChunkedTable.h" +#include "replica/util/ChunkedTable.h" // Boost unit test header #define BOOST_TEST_MODULE ChunkedTableTest diff --git a/src/replica/tests/testConfiguration.cc b/src/replica/tests/testConfiguration.cc index 7f55c9b054..4667d45de0 100644 --- a/src/replica/tests/testConfiguration.cc +++ b/src/replica/tests/testConfiguration.cc @@ -40,10 +40,10 @@ // Qserv headers #include "global/constants.h" -#include "replica/Common.h" #include "replica/config/ConfigTestData.h" #include "replica/config/Configuration.h" -#include "replica/ProtocolBuffer.h" +#include "replica/util/Common.h" +#include "replica/util/ProtocolBuffer.h" // Boost unit test header #define BOOST_TEST_MODULE Configuration diff --git a/src/replica/tests/testConnectionParams.cc b/src/replica/tests/testConnectionParams.cc index 8a1b80ab98..fdd60dc820 100644 --- a/src/replica/tests/testConnectionParams.cc +++ b/src/replica/tests/testConnectionParams.cc @@ -24,7 +24,7 @@ // Qserv headers #include "replica/mysql/DatabaseMySQLTypes.h" -#include "replica/FileUtils.h" +#include "replica/util/FileUtils.h" // Boost unit test header #define BOOST_TEST_MODULE ConnectionParamsTest diff --git a/src/replica/tests/testCsv.cc b/src/replica/tests/testCsv.cc index 0ff1954f49..33e9a70680 100644 --- a/src/replica/tests/testCsv.cc +++ b/src/replica/tests/testCsv.cc @@ -33,8 +33,8 @@ #include // Qserv headers -#include "replica/Csv.h" #include "replica/protocol.pb.h" +#include "replica/util/Csv.h" // Boost unit test header #define BOOST_TEST_MODULE Csv diff --git a/src/replica/tests/testFileUtils.cc b/src/replica/tests/testFileUtils.cc index 367c4278d1..16d37927d8 100644 --- a/src/replica/tests/testFileUtils.cc +++ b/src/replica/tests/testFileUtils.cc @@ -23,7 +23,7 @@ #include "lsst/log/Log.h" // Qserv headers -#include "replica/FileUtils.h" +#include "replica/util/FileUtils.h" // System headers #include diff --git a/src/replica/tests/testIngestRequestMgr.cc b/src/replica/tests/testIngestRequestMgr.cc index ea79dbb18c..4834245a5a 100644 --- a/src/replica/tests/testIngestRequestMgr.cc +++ b/src/replica/tests/testIngestRequestMgr.cc @@ -32,7 +32,7 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/database/TransactionContrib.h" +#include "replica/ingest/TransactionContrib.h" #include "replica/ingest/IngestRequest.h" #include "replica/ingest/IngestRequestMgr.h" #include "replica/ingest/IngestResourceMgrT.h" diff --git a/src/replica/tests/testMessageQueue.cc b/src/replica/tests/testMessageQueue.cc index 25c1325d31..020952e9dd 100644 --- a/src/replica/tests/testMessageQueue.cc +++ b/src/replica/tests/testMessageQueue.cc @@ -25,7 +25,7 @@ #include // Qserv headers -#include "replica/MessageQueue.h" +#include "replica/util/MessageQueue.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/tests/testNamedMutexRegistry.cc b/src/replica/tests/testNamedMutexRegistry.cc index c219c3c785..944a4df240 100644 --- a/src/replica/tests/testNamedMutexRegistry.cc +++ b/src/replica/tests/testNamedMutexRegistry.cc @@ -31,9 +31,9 @@ #include // Qserv headers -#include "replica/Common.h" -#include "replica/NamedMutexRegistry.h" -#include "replica/Mutex.h" +#include "replica/util/Common.h" +#include "replica/util/Mutex.h" +#include "replica/util/NamedMutexRegistry.h" #include "util/BlockPost.h" // LSST headers diff --git a/src/replica/tests/testReplicaInfo.cc b/src/replica/tests/testReplicaInfo.cc index 5493c10e99..ed05474644 100644 --- a/src/replica/tests/testReplicaInfo.cc +++ b/src/replica/tests/testReplicaInfo.cc @@ -28,7 +28,7 @@ #include "lsst/log/Log.h" // Qserv headers -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" // Boost unit test header #define BOOST_TEST_MODULE ReplicaInfo diff --git a/src/replica/tests/testSemanticMap.cc b/src/replica/tests/testSemanticMap.cc index 5dfec85992..dbb60a403f 100644 --- a/src/replica/tests/testSemanticMap.cc +++ b/src/replica/tests/testSemanticMap.cc @@ -34,7 +34,7 @@ #include "lsst/log/Log.h" // Qserv headers -#include "replica/SemanticMaps.h" +#include "replica/util/SemanticMaps.h" // Boost unit test header #define BOOST_TEST_MODULE SemanticMaps diff --git a/src/replica/tests/testSqlResultSet.cc b/src/replica/tests/testSqlResultSet.cc index 7c1f97c4c1..aa47f81ccc 100644 --- a/src/replica/tests/testSqlResultSet.cc +++ b/src/replica/tests/testSqlResultSet.cc @@ -29,7 +29,7 @@ // Qserv headers #include "replica/mysql/DatabaseMySQLRow.h" -#include "replica/SqlResultSet.h" +#include "replica/requests/SqlResultSet.h" // System headers #include diff --git a/src/replica/tests/testSqlSchemaUtils.cc b/src/replica/tests/testSqlSchemaUtils.cc index 70a08f7674..abed56d5dd 100644 --- a/src/replica/tests/testSqlSchemaUtils.cc +++ b/src/replica/tests/testSqlSchemaUtils.cc @@ -28,7 +28,7 @@ #include "lsst/log/Log.h" // Qserv headers -#include "replica/SqlSchemaUtils.h" +#include "replica/util/SqlSchemaUtils.h" // System headers #include diff --git a/src/replica/tests/testTypes.cc b/src/replica/tests/testTypes.cc index a7fe8f5bf7..68e1687b06 100644 --- a/src/replica/tests/testTypes.cc +++ b/src/replica/tests/testTypes.cc @@ -29,7 +29,7 @@ #include "lsst/log/Log.h" // Qserv headers -#include "replica/Common.h" +#include "replica/util/Common.h" // Boost unit test header #define BOOST_TEST_MODULE CommonTypes diff --git a/src/replica/util/CMakeLists.txt b/src/replica/util/CMakeLists.txt new file mode 100644 index 0000000000..2af349d7d2 --- /dev/null +++ b/src/replica/util/CMakeLists.txt @@ -0,0 +1,20 @@ +add_library(replica_util OBJECT) +target_sources(replica_util PRIVATE + ChunkNumber.cc + ChunkedTable.cc + Common.cc + Csv.cc + FileUtils.cc + HttpSvc.cc + Mutex.cc + NamedMutexRegistry.cc + Performance.cc + ProtocolBuffer.cc + ReplicaInfo.cc + SqlSchemaUtils.cc + SuccessRateGenerator.cc +) +target_link_libraries(replica_util PUBLIC + log + sphgeom +) diff --git a/src/replica/ChunkNumber.cc b/src/replica/util/ChunkNumber.cc similarity index 98% rename from src/replica/ChunkNumber.cc rename to src/replica/util/ChunkNumber.cc index fcd07c4d1f..9ff19bea50 100644 --- a/src/replica/ChunkNumber.cc +++ b/src/replica/util/ChunkNumber.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/ChunkNumber.h" +#include "replica/util/ChunkNumber.h" // System headers #include @@ -28,7 +28,7 @@ #include // Qserv headers -#include "replica/Common.h" +#include "replica/util/Common.h" using namespace std; diff --git a/src/replica/ChunkNumber.h b/src/replica/util/ChunkNumber.h similarity index 100% rename from src/replica/ChunkNumber.h rename to src/replica/util/ChunkNumber.h diff --git a/src/replica/ChunkedTable.cc b/src/replica/util/ChunkedTable.cc similarity index 98% rename from src/replica/ChunkedTable.cc rename to src/replica/util/ChunkedTable.cc index 6d459fe43f..545ca9a3dd 100644 --- a/src/replica/ChunkedTable.cc +++ b/src/replica/util/ChunkedTable.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/ChunkedTable.h" +#include "replica/util/ChunkedTable.h" // System headers #include diff --git a/src/replica/ChunkedTable.h b/src/replica/util/ChunkedTable.h similarity index 100% rename from src/replica/ChunkedTable.h rename to src/replica/util/ChunkedTable.h diff --git a/src/replica/Common.cc b/src/replica/util/Common.cc similarity index 99% rename from src/replica/Common.cc rename to src/replica/util/Common.cc index 828b943474..11c08df7cb 100644 --- a/src/replica/Common.cc +++ b/src/replica/util/Common.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/Common.h" +#include "replica/util/Common.h" // System headers #include diff --git a/src/replica/Common.h b/src/replica/util/Common.h similarity index 99% rename from src/replica/Common.h rename to src/replica/util/Common.h index 9e8e326c35..5f6dc05d25 100644 --- a/src/replica/Common.h +++ b/src/replica/util/Common.h @@ -38,7 +38,7 @@ // Qserv headers #include "replica/protocol.pb.h" -#include "replica/Mutex.h" +#include "replica/util/Mutex.h" // This header declarations namespace lsst::qserv::replica { 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 99% rename from src/replica/Csv.h rename to src/replica/util/Csv.h index 784b5347fe..f95fadd809 100644 --- a/src/replica/Csv.h +++ b/src/replica/util/Csv.h @@ -29,8 +29,8 @@ #include "nlohmann/json.hpp" // Qserv headers -#include "replica/Common.h" #include "replica/protocol.pb.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica::csv { diff --git a/src/replica/ErrorReporting.h b/src/replica/util/ErrorReporting.h similarity index 98% rename from src/replica/ErrorReporting.h rename to src/replica/util/ErrorReporting.h index 1caae438c1..86bef9dc5c 100644 --- a/src/replica/ErrorReporting.h +++ b/src/replica/util/ErrorReporting.h @@ -31,7 +31,7 @@ #include // Qserv headers -#include "replica/Common.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/FileUtils.cc b/src/replica/util/FileUtils.cc similarity index 99% rename from src/replica/FileUtils.cc rename to src/replica/util/FileUtils.cc index 8f5590b083..05ed137697 100644 --- a/src/replica/FileUtils.cc +++ b/src/replica/util/FileUtils.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/FileUtils.h" +#include "replica/util/FileUtils.h" // System headers #include diff --git a/src/replica/FileUtils.h b/src/replica/util/FileUtils.h similarity index 100% rename from src/replica/FileUtils.h rename to src/replica/util/FileUtils.h diff --git a/src/replica/HttpSvc.cc b/src/replica/util/HttpSvc.cc similarity index 98% rename from src/replica/HttpSvc.cc rename to src/replica/util/HttpSvc.cc index f62c6c338a..ddd790aba4 100644 --- a/src/replica/HttpSvc.cc +++ b/src/replica/util/HttpSvc.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/HttpSvc.h" +#include "replica/util/HttpSvc.h" // System headers #include diff --git a/src/replica/HttpSvc.h b/src/replica/util/HttpSvc.h similarity index 98% rename from src/replica/HttpSvc.h rename to src/replica/util/HttpSvc.h index 91fadf8e32..42022a31f9 100644 --- a/src/replica/HttpSvc.h +++ b/src/replica/util/HttpSvc.h @@ -30,7 +30,7 @@ // Qserv headers #include "qhttp/Server.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/MessageQueue.h b/src/replica/util/MessageQueue.h similarity index 93% rename from src/replica/MessageQueue.h rename to src/replica/util/MessageQueue.h index 90a62bf523..db32489ab2 100644 --- a/src/replica/MessageQueue.h +++ b/src/replica/util/MessageQueue.h @@ -32,28 +32,36 @@ #include // Qserv headers -#include "replica/Common.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { /** * Class MessageQueue is the priority-based queue for storing shared pointers - * to objects of class MessageWrapperBase. Requests of the same priority are - * organized as the FIFO-based sub-queues (priority "lanes"). + * to objects of any class that provides the required unique identity. Objects + * of the same priority are organized as the FIFO-based sub-queues (priority "lanes"). * + * The following defines the required interface for classes supported by + * this collection: + * @code + * class Element { + * public: + * std::string const& id() const; + * }; + * @code * The implementation is optimized for three most frequent operations with * the queue: * - fetching the first element from the front of the highest-priority lane, * - pushing elements to the front of the corresponding priority lane, * - pushing elements to the end of the corresponding priority lane. + * * Since the number of unique priorities in the Replication system's framework * is rather small the performances of the above-mentioned operations is nearly * constant in this implementation. * * The lookup operation based on a unique identifier of an object has the 'O(n)' - * performance. The operation is of no concern since it's only used in response - * to the message cancellation requests, which are rather infrequent. + * performance. * * @note The implementation won't enforce the uniqueness of elements of * the same identifier accross different priority lanes. It's up to @@ -69,8 +77,6 @@ namespace lsst::qserv::replica { * to ensure exclusive access to the queue. * @note The class template is needed to allow unit testing the queue using * simplified element classes. - * - * @see class MessageWrapperBase. */ template class MessageQueue { diff --git a/src/replica/Mutex.cc b/src/replica/util/Mutex.cc similarity index 98% rename from src/replica/Mutex.cc rename to src/replica/util/Mutex.cc index a4d9f463d2..d9d4568f1e 100644 --- a/src/replica/Mutex.cc +++ b/src/replica/util/Mutex.cc @@ -21,7 +21,7 @@ */ // Class header -#include "replica/Mutex.h" +#include "replica/util/Mutex.h" // System headers #include diff --git a/src/replica/Mutex.h b/src/replica/util/Mutex.h similarity index 100% rename from src/replica/Mutex.h rename to src/replica/util/Mutex.h diff --git a/src/replica/NamedMutexRegistry.cc b/src/replica/util/NamedMutexRegistry.cc similarity index 98% rename from src/replica/NamedMutexRegistry.cc rename to src/replica/util/NamedMutexRegistry.cc index b745696d21..d656f57ebf 100644 --- a/src/replica/NamedMutexRegistry.cc +++ b/src/replica/util/NamedMutexRegistry.cc @@ -22,7 +22,7 @@ */ // Class header -#include "replica/NamedMutexRegistry.h" +#include "replica/util/NamedMutexRegistry.h" // System headers #include diff --git a/src/replica/NamedMutexRegistry.h b/src/replica/util/NamedMutexRegistry.h similarity index 98% rename from src/replica/NamedMutexRegistry.h rename to src/replica/util/NamedMutexRegistry.h index e3a2d462a5..a081844a2f 100644 --- a/src/replica/NamedMutexRegistry.h +++ b/src/replica/util/NamedMutexRegistry.h @@ -27,7 +27,7 @@ #include // Qserv headers -#include "replica/Mutex.h" +#include "replica/util/Mutex.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/OneWayFailer.h b/src/replica/util/OneWayFailer.h similarity index 90% rename from src/replica/OneWayFailer.h rename to src/replica/util/OneWayFailer.h index d9d364ffec..f18cca82a8 100644 --- a/src/replica/OneWayFailer.h +++ b/src/replica/util/OneWayFailer.h @@ -33,15 +33,11 @@ namespace lsst::qserv::replica { */ class OneWayFailer { public: - /** - * Fail the state. - * - * @return - * the previous state of the object - */ + /// Fail the state. + /// @return The previous state of the object. bool fail() { return _failed.exchange(true); } - /// @return the current state of the object + /// @return The current state of the object. bool operator()() const { return _failed; } private: diff --git a/src/replica/Performance.cc b/src/replica/util/Performance.cc similarity index 98% rename from src/replica/Performance.cc rename to src/replica/util/Performance.cc index 1b950a9989..8313caa12c 100644 --- a/src/replica/Performance.cc +++ b/src/replica/util/Performance.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/Performance.h" +#include "replica/util/Performance.h" // Qserv headers #include "replica/protocol.pb.h" diff --git a/src/replica/Performance.h b/src/replica/util/Performance.h similarity index 100% rename from src/replica/Performance.h rename to src/replica/util/Performance.h diff --git a/src/replica/ProtocolBuffer.cc b/src/replica/util/ProtocolBuffer.cc similarity index 99% rename from src/replica/ProtocolBuffer.cc rename to src/replica/util/ProtocolBuffer.cc index 3e7e9d52be..991b6530f0 100644 --- a/src/replica/ProtocolBuffer.cc +++ b/src/replica/util/ProtocolBuffer.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/ProtocolBuffer.h" +#include "replica/util/ProtocolBuffer.h" // System headers #include diff --git a/src/replica/ProtocolBuffer.h b/src/replica/util/ProtocolBuffer.h similarity index 100% rename from src/replica/ProtocolBuffer.h rename to src/replica/util/ProtocolBuffer.h diff --git a/src/replica/ReplicaInfo.cc b/src/replica/util/ReplicaInfo.cc similarity index 99% rename from src/replica/ReplicaInfo.cc rename to src/replica/util/ReplicaInfo.cc index 4f13b9cf13..9658f9f3a0 100644 --- a/src/replica/ReplicaInfo.cc +++ b/src/replica/util/ReplicaInfo.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" // System headers #include diff --git a/src/replica/ReplicaInfo.h b/src/replica/util/ReplicaInfo.h similarity index 100% rename from src/replica/ReplicaInfo.h rename to src/replica/util/ReplicaInfo.h diff --git a/src/replica/SemanticMaps.h b/src/replica/util/SemanticMaps.h similarity index 100% rename from src/replica/SemanticMaps.h rename to src/replica/util/SemanticMaps.h diff --git a/src/replica/SqlSchemaUtils.cc b/src/replica/util/SqlSchemaUtils.cc similarity index 98% rename from src/replica/SqlSchemaUtils.cc rename to src/replica/util/SqlSchemaUtils.cc index 5aa20158f4..689fb99111 100644 --- a/src/replica/SqlSchemaUtils.cc +++ b/src/replica/util/SqlSchemaUtils.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/SqlSchemaUtils.h" +#include "replica/util/SqlSchemaUtils.h" // System headers #include diff --git a/src/replica/SqlSchemaUtils.h b/src/replica/util/SqlSchemaUtils.h similarity index 98% rename from src/replica/SqlSchemaUtils.h rename to src/replica/util/SqlSchemaUtils.h index c919c2862c..d2868afb6f 100644 --- a/src/replica/SqlSchemaUtils.h +++ b/src/replica/util/SqlSchemaUtils.h @@ -27,7 +27,7 @@ #include // Qserv headers -#include "replica/Common.h" +#include "replica/util/Common.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/SuccessRateGenerator.cc b/src/replica/util/SuccessRateGenerator.cc similarity index 96% rename from src/replica/SuccessRateGenerator.cc rename to src/replica/util/SuccessRateGenerator.cc index c19dff5924..d12842bd04 100644 --- a/src/replica/SuccessRateGenerator.cc +++ b/src/replica/util/SuccessRateGenerator.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/SuccessRateGenerator.h" +#include "replica/util/SuccessRateGenerator.h" using namespace std; diff --git a/src/replica/SuccessRateGenerator.h b/src/replica/util/SuccessRateGenerator.h similarity index 98% rename from src/replica/SuccessRateGenerator.h rename to src/replica/util/SuccessRateGenerator.h index a3997d8807..ebd23005c9 100644 --- a/src/replica/SuccessRateGenerator.h +++ b/src/replica/util/SuccessRateGenerator.h @@ -25,7 +25,7 @@ #include // Qserv headers -#include "replica/Mutex.h" +#include "replica/util/Mutex.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/worker/CMakeLists.txt b/src/replica/worker/CMakeLists.txt index 504c10f918..45137f32f6 100644 --- a/src/replica/worker/CMakeLists.txt +++ b/src/replica/worker/CMakeLists.txt @@ -1,5 +1,8 @@ add_library(replica_worker OBJECT) target_sources(replica_worker PRIVATE + FileClient.cc + FileServer.cc + FileServerConnection.cc WorkerDeleteRequest.cc WorkerDirectorIndexRequest.cc WorkerEchoRequest.cc diff --git a/src/replica/FileClient.cc b/src/replica/worker/FileClient.cc similarity index 98% rename from src/replica/FileClient.cc rename to src/replica/worker/FileClient.cc index 11d75641b7..719b4173af 100644 --- a/src/replica/FileClient.cc +++ b/src/replica/worker/FileClient.cc @@ -20,13 +20,13 @@ */ // Class header -#include "replica/FileClient.h" +#include "replica/worker/FileClient.h" // Qserv headers #include "replica/config/Configuration.h" #include "replica/protocol.pb.h" -#include "replica/ProtocolBuffer.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ProtocolBuffer.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/FileClient.h b/src/replica/worker/FileClient.h similarity index 99% rename from src/replica/FileClient.h rename to src/replica/worker/FileClient.h index c5ed2aa276..ab06a6aa08 100644 --- a/src/replica/FileClient.h +++ b/src/replica/worker/FileClient.h @@ -40,7 +40,7 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/FileServer.cc b/src/replica/worker/FileServer.cc similarity index 97% rename from src/replica/FileServer.cc rename to src/replica/worker/FileServer.cc index 6dc859f11c..0733fcc02a 100644 --- a/src/replica/FileServer.cc +++ b/src/replica/worker/FileServer.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/FileServer.h" +#include "replica/worker/FileServer.h" // System headers #include @@ -28,7 +28,7 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/FileServer.h b/src/replica/worker/FileServer.h similarity index 97% rename from src/replica/FileServer.h rename to src/replica/worker/FileServer.h index 2ad2aafa3b..e3813cb487 100644 --- a/src/replica/FileServer.h +++ b/src/replica/worker/FileServer.h @@ -34,8 +34,8 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/FileServerConnection.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/worker/FileServerConnection.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/FileServerConnection.cc b/src/replica/worker/FileServerConnection.cc similarity index 99% rename from src/replica/FileServerConnection.cc rename to src/replica/worker/FileServerConnection.cc index b187f926b4..cd1ed97d96 100644 --- a/src/replica/FileServerConnection.cc +++ b/src/replica/worker/FileServerConnection.cc @@ -20,7 +20,7 @@ */ // Class header -#include "replica/FileServerConnection.h" +#include "replica/worker/FileServerConnection.h" // System headers #include @@ -34,7 +34,7 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/FileServerConnection.h b/src/replica/worker/FileServerConnection.h similarity index 98% rename from src/replica/FileServerConnection.h rename to src/replica/worker/FileServerConnection.h index 04fa189214..c980783ca0 100644 --- a/src/replica/FileServerConnection.h +++ b/src/replica/worker/FileServerConnection.h @@ -38,8 +38,8 @@ // Qserv headers #include "replica/protocol.pb.h" -#include "replica/ProtocolBuffer.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ProtocolBuffer.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/worker/WorkerDeleteRequest.cc b/src/replica/worker/WorkerDeleteRequest.cc index 7be5b42aa3..102883d8c9 100644 --- a/src/replica/worker/WorkerDeleteRequest.cc +++ b/src/replica/worker/WorkerDeleteRequest.cc @@ -29,8 +29,8 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/FileUtils.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/FileUtils.h" #include "util/TimeUtils.h" // LSST headers diff --git a/src/replica/worker/WorkerDeleteRequest.h b/src/replica/worker/WorkerDeleteRequest.h index f4e521528c..6e8dd33dfc 100644 --- a/src/replica/worker/WorkerDeleteRequest.h +++ b/src/replica/worker/WorkerDeleteRequest.h @@ -27,7 +27,7 @@ // Qserv headers #include "replica/protocol.pb.h" -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" #include "replica/worker/WorkerRequest.h" // This header declarations diff --git a/src/replica/worker/WorkerDirectorIndexRequest.cc b/src/replica/worker/WorkerDirectorIndexRequest.cc index a57e259b8d..b6dce45435 100644 --- a/src/replica/worker/WorkerDirectorIndexRequest.cc +++ b/src/replica/worker/WorkerDirectorIndexRequest.cc @@ -35,8 +35,8 @@ #include "global/constants.h" #include "replica/config/Configuration.h" #include "replica/mysql/DatabaseMySQL.h" -#include "replica/Performance.h" -#include "replica/ProtocolBuffer.h" +#include "replica/util/Performance.h" +#include "replica/util/ProtocolBuffer.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/worker/WorkerEchoRequest.cc b/src/replica/worker/WorkerEchoRequest.cc index 8e2e93a415..4a84622929 100644 --- a/src/replica/worker/WorkerEchoRequest.cc +++ b/src/replica/worker/WorkerEchoRequest.cc @@ -26,7 +26,7 @@ #include // Qserv headers -#include "replica/Performance.h" +#include "replica/util/Performance.h" #include "util/BlockPost.h" // LSST headers diff --git a/src/replica/worker/WorkerFindAllRequest.cc b/src/replica/worker/WorkerFindAllRequest.cc index 45b409c494..38f5b13679 100644 --- a/src/replica/worker/WorkerFindAllRequest.cc +++ b/src/replica/worker/WorkerFindAllRequest.cc @@ -30,8 +30,8 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/FileUtils.h" -#include "replica/ServiceProvider.h" +#include "replica/util/FileUtils.h" +#include "replica/services/ServiceProvider.h" #include "util/TimeUtils.h" // LSST headers diff --git a/src/replica/worker/WorkerFindAllRequest.h b/src/replica/worker/WorkerFindAllRequest.h index 869d6cc0bb..5b5ae41057 100644 --- a/src/replica/worker/WorkerFindAllRequest.h +++ b/src/replica/worker/WorkerFindAllRequest.h @@ -26,7 +26,7 @@ // Qserv headers #include "replica/protocol.pb.h" -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" #include "replica/worker/WorkerRequest.h" // This header declarations diff --git a/src/replica/worker/WorkerFindRequest.cc b/src/replica/worker/WorkerFindRequest.cc index b44c7b65f4..76a9abcb1b 100644 --- a/src/replica/worker/WorkerFindRequest.cc +++ b/src/replica/worker/WorkerFindRequest.cc @@ -29,8 +29,8 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/FileUtils.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/FileUtils.h" #include "util/TimeUtils.h" // LSST headers diff --git a/src/replica/worker/WorkerFindRequest.h b/src/replica/worker/WorkerFindRequest.h index f9482eda41..d4bcba4aa7 100644 --- a/src/replica/worker/WorkerFindRequest.h +++ b/src/replica/worker/WorkerFindRequest.h @@ -25,7 +25,7 @@ #include // Qserv headers -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" #include "replica/worker/WorkerRequest.h" // Forward declarations diff --git a/src/replica/worker/WorkerProcessor.cc b/src/replica/worker/WorkerProcessor.cc index f22990017c..9b1d24343f 100644 --- a/src/replica/worker/WorkerProcessor.cc +++ b/src/replica/worker/WorkerProcessor.cc @@ -29,7 +29,7 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" #include "replica/worker/WorkerDeleteRequest.h" #include "replica/worker/WorkerEchoRequest.h" #include "replica/worker/WorkerFindRequest.h" diff --git a/src/replica/worker/WorkerProcessor.h b/src/replica/worker/WorkerProcessor.h index 0d8e66492e..6d6de28a7e 100644 --- a/src/replica/worker/WorkerProcessor.h +++ b/src/replica/worker/WorkerProcessor.h @@ -33,10 +33,10 @@ // Qserv headers #include "replica/protocol.pb.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Mutex.h" #include "replica/worker/WorkerProcessorThread.h" #include "replica/worker/WorkerRequest.h" -#include "replica/Mutex.h" // Forward declarations namespace lsst::qserv::replica { diff --git a/src/replica/worker/WorkerReplicationRequest.cc b/src/replica/worker/WorkerReplicationRequest.cc index 68df4cd9c2..02ce1d2b51 100644 --- a/src/replica/worker/WorkerReplicationRequest.cc +++ b/src/replica/worker/WorkerReplicationRequest.cc @@ -29,9 +29,9 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/FileClient.h" -#include "replica/FileUtils.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/FileUtils.h" +#include "replica/worker/FileClient.h" #include "util/TimeUtils.h" // LSST headers diff --git a/src/replica/worker/WorkerReplicationRequest.h b/src/replica/worker/WorkerReplicationRequest.h index cff5a16864..ab9d982198 100644 --- a/src/replica/worker/WorkerReplicationRequest.h +++ b/src/replica/worker/WorkerReplicationRequest.h @@ -33,7 +33,7 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ReplicaInfo.h" +#include "replica/util/ReplicaInfo.h" #include "replica/worker/WorkerRequest.h" // Forward declarations diff --git a/src/replica/worker/WorkerRequest.cc b/src/replica/worker/WorkerRequest.cc index fbca6a25f9..245c27573d 100644 --- a/src/replica/worker/WorkerRequest.cc +++ b/src/replica/worker/WorkerRequest.cc @@ -30,8 +30,8 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" -#include "replica/SuccessRateGenerator.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/SuccessRateGenerator.h" #include "util/BlockPost.h" // LSST headers diff --git a/src/replica/worker/WorkerRequest.h b/src/replica/worker/WorkerRequest.h index 2cc73da788..2af2618e6b 100644 --- a/src/replica/worker/WorkerRequest.h +++ b/src/replica/worker/WorkerRequest.h @@ -32,11 +32,11 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/Common.h" -#include "replica/Performance.h" #include "replica/protocol.pb.h" -#include "replica/ServiceProvider.h" -#include "replica/Mutex.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/Common.h" +#include "replica/util/Mutex.h" +#include "replica/util/Performance.h" // This header declarations namespace lsst::qserv::replica { diff --git a/src/replica/worker/WorkerRequestFactory.cc b/src/replica/worker/WorkerRequestFactory.cc index 2229d0ad6c..251ddd98fc 100644 --- a/src/replica/worker/WorkerRequestFactory.cc +++ b/src/replica/worker/WorkerRequestFactory.cc @@ -28,7 +28,7 @@ // Qserv headers #include "replica/mysql/DatabaseMySQL.h" #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" #include "replica/worker/WorkerDeleteRequest.h" #include "replica/worker/WorkerEchoRequest.h" #include "replica/worker/WorkerFindAllRequest.h" diff --git a/src/replica/worker/WorkerRequestFactory.h b/src/replica/worker/WorkerRequestFactory.h index 55bff23faa..0b254a8f8d 100644 --- a/src/replica/worker/WorkerRequestFactory.h +++ b/src/replica/worker/WorkerRequestFactory.h @@ -27,7 +27,7 @@ #include // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" #include "replica/worker/WorkerRequest.h" // Forward declarations diff --git a/src/replica/worker/WorkerServer.cc b/src/replica/worker/WorkerServer.cc index 4dcbf2b904..02a79dc93e 100644 --- a/src/replica/worker/WorkerServer.cc +++ b/src/replica/worker/WorkerServer.cc @@ -29,7 +29,7 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" #include "replica/worker/WorkerProcessor.h" // LSST headers diff --git a/src/replica/worker/WorkerServer.h b/src/replica/worker/WorkerServer.h index 97237b5b65..0897fb10fe 100644 --- a/src/replica/worker/WorkerServer.h +++ b/src/replica/worker/WorkerServer.h @@ -28,7 +28,7 @@ #include "boost/asio.hpp" // Qserv headers -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" #include "replica/worker/WorkerProcessor.h" #include "replica/worker/WorkerServerConnection.h" diff --git a/src/replica/worker/WorkerServerConnection.cc b/src/replica/worker/WorkerServerConnection.cc index cffda89339..d77d639526 100644 --- a/src/replica/worker/WorkerServerConnection.cc +++ b/src/replica/worker/WorkerServerConnection.cc @@ -27,8 +27,8 @@ // Qserv headers #include "replica/config/Configuration.h" -#include "replica/Performance.h" -#include "replica/ProtocolBuffer.h" +#include "replica/util/Performance.h" +#include "replica/util/ProtocolBuffer.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/worker/WorkerServerConnection.h b/src/replica/worker/WorkerServerConnection.h index 011dfa9236..1eaeb64dac 100644 --- a/src/replica/worker/WorkerServerConnection.h +++ b/src/replica/worker/WorkerServerConnection.h @@ -30,8 +30,8 @@ // Qserv headers #include "replica/protocol.pb.h" -#include "replica/ProtocolBuffer.h" -#include "replica/ServiceProvider.h" +#include "replica/services/ServiceProvider.h" +#include "replica/util/ProtocolBuffer.h" #include "replica/worker/WorkerProcessor.h" // This header declarations diff --git a/src/replica/worker/WorkerSqlRequest.cc b/src/replica/worker/WorkerSqlRequest.cc index 8b20823b3d..6e294f0288 100644 --- a/src/replica/worker/WorkerSqlRequest.cc +++ b/src/replica/worker/WorkerSqlRequest.cc @@ -28,8 +28,8 @@ // Qserv headers #include "replica/config/Configuration.h" #include "replica/mysql/DatabaseMySQLUtils.h" -#include "replica/Performance.h" -#include "replica/Mutex.h" +#include "replica/util/Performance.h" +#include "replica/util/Mutex.h" // LSST headers #include "lsst/log/Log.h" diff --git a/src/replica/worker/WorkerSqlRequest.h b/src/replica/worker/WorkerSqlRequest.h index eeaac8d5a4..d918f35df5 100644 --- a/src/replica/worker/WorkerSqlRequest.h +++ b/src/replica/worker/WorkerSqlRequest.h @@ -26,9 +26,9 @@ #include // Qserv headers -#include "replica/protocol.pb.h" -#include "replica/Common.h" #include "replica/mysql/DatabaseMySQL.h" +#include "replica/protocol.pb.h" +#include "replica/util/Common.h" #include "replica/worker/WorkerRequest.h" // Forward declarations