From fdf17c825c9d392bbad7e7466824b01032ad76ad Mon Sep 17 00:00:00 2001 From: Filipriec Date: Mon, 31 Aug 2026 14:37:09 +0200 Subject: [PATCH] removed swapping of the db --- client-gui2 | 2 +- common/proto/backup.proto | 7 --- common/src/proto/descriptor.bin | Bin 212585 -> 211624 bytes common/src/proto/komp_ac.backup.rs | 88 ----------------------------- server | 2 +- 5 files changed, 2 insertions(+), 97 deletions(-) diff --git a/client-gui2 b/client-gui2 index 5c3181a6..412a577e 160000 --- a/client-gui2 +++ b/client-gui2 @@ -1 +1 @@ -Subproject commit 5c3181a65d943639caab3182e723206da316eaef +Subproject commit 412a577e47d64c1b220aef061da983268ee48dc6 diff --git a/common/proto/backup.proto b/common/proto/backup.proto index 65a189ed..9673ba2d 100644 --- a/common/proto/backup.proto +++ b/common/proto/backup.proto @@ -12,7 +12,6 @@ service BackupService { rpc ListDatabases(komp_ac.common.Empty) returns (ListDatabasesResponse); rpc CreateDatabase(CreateDatabaseRequest) returns (DatabaseInfo); rpc RunDatabaseMigrations(DatabaseRequest) returns (DatabaseInfo); - rpc ActivateDatabase(DatabaseRequest) returns (ActivateDatabaseResponse); } message DatabaseRequest { @@ -40,12 +39,6 @@ message ListDatabasesResponse { repeated DatabaseInfo databases = 2; } -message ActivateDatabaseResponse { - string database_name = 1; - bool switching = 2; - string message = 3; -} - enum BackupType { BACKUP_TYPE_UNSPECIFIED = 0; BACKUP_TYPE_FULL = 1; diff --git a/common/src/proto/descriptor.bin b/common/src/proto/descriptor.bin index 2bbd14515dd43b9e949a0351f191797b9b02e545..b1d04d2a77acbb505a3aeb2fde072fc103deb384 100644 GIT binary patch delta 4175 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 EzYatieE, } -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct ActivateDatabaseResponse { - #[prost(string, tag = "1")] - pub database_name: ::prost::alloc::string::String, - #[prost(bool, tag = "2")] - pub switching: bool, - #[prost(string, tag = "3")] - pub message: ::prost::alloc::string::String, -} #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)] pub struct StartBackupRequest { #[prost(enumeration = "BackupType", tag = "1")] @@ -484,32 +475,6 @@ pub mod backup_service_client { ); self.inner.unary(req, path, codec).await } - pub async fn activate_database( - &mut self, - request: impl tonic::IntoRequest, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - > { - self.inner - .ready() - .await - .map_err(|e| { - tonic::Status::unknown( - format!("Service was not ready: {}", e.into()), - ) - })?; - let codec = tonic_prost::ProstCodec::default(); - let path = http::uri::PathAndQuery::from_static( - "/komp_ac.backup.BackupService/ActivateDatabase", - ); - let mut req = request.into_request(); - req.extensions_mut() - .insert( - GrpcMethod::new("komp_ac.backup.BackupService", "ActivateDatabase"), - ); - self.inner.unary(req, path, codec).await - } } } /// Generated server implementations. @@ -575,13 +540,6 @@ pub mod backup_service_server { &self, request: tonic::Request, ) -> std::result::Result, tonic::Status>; - async fn activate_database( - &self, - request: tonic::Request, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - >; } #[derive(Debug)] pub struct BackupServiceServer { @@ -1024,52 +982,6 @@ pub mod backup_service_server { }; Box::pin(fut) } - "/komp_ac.backup.BackupService/ActivateDatabase" => { - #[allow(non_camel_case_types)] - struct ActivateDatabaseSvc(pub Arc); - impl< - T: BackupService, - > tonic::server::UnaryService - for ActivateDatabaseSvc { - type Response = super::ActivateDatabaseResponse; - type Future = BoxFuture< - tonic::Response, - tonic::Status, - >; - fn call( - &mut self, - request: tonic::Request, - ) -> Self::Future { - let inner = Arc::clone(&self.0); - let fut = async move { - ::activate_database(&inner, request) - .await - }; - Box::pin(fut) - } - } - let accept_compression_encodings = self.accept_compression_encodings; - let send_compression_encodings = self.send_compression_encodings; - let max_decoding_message_size = self.max_decoding_message_size; - let max_encoding_message_size = self.max_encoding_message_size; - let inner = self.inner.clone(); - let fut = async move { - let method = ActivateDatabaseSvc(inner); - let codec = tonic_prost::ProstCodec::default(); - let mut grpc = tonic::server::Grpc::new(codec) - .apply_compression_config( - accept_compression_encodings, - send_compression_encodings, - ) - .apply_max_message_size_config( - max_decoding_message_size, - max_encoding_message_size, - ); - let res = grpc.unary(method, req).await; - Ok(res) - }; - Box::pin(fut) - } _ => { Box::pin(async move { let mut response = http::Response::new( diff --git a/server b/server index ec9f1f19..8f18fa39 160000 --- a/server +++ b/server @@ -1 +1 @@ -Subproject commit ec9f1f19de0b25286afdfc27205f4afd3d0ef2a6 +Subproject commit 8f18fa39e342626c10b08e7409a1a6909c383f55