From 7cea26423010a09ef6777c17ac210cd11cfb14c7 Mon Sep 17 00:00:00 2001 From: Vitaly Baranov Date: Wed, 3 May 2023 12:33:35 +0200 Subject: [PATCH] Fix whitespaces. --- src/Backups/BackupIO.h | 4 ++-- src/Backups/BackupIO_Default.h | 4 ++-- src/Backups/BackupIO_Disk.cpp | 5 ----- src/Backups/BackupIO_File.cpp | 5 +++++ src/Backups/IBackupEntry.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Backups/BackupIO.h b/src/Backups/BackupIO.h index d522387deba..e4a82a604e8 100644 --- a/src/Backups/BackupIO.h +++ b/src/Backups/BackupIO.h @@ -28,10 +28,10 @@ public: /// The function copyFileToDisk() can be much faster than reading the file with readFile() and then writing it to some disk. /// (especially for S3 where it can use CopyObject to copy objects inside S3 instead of downloading and uploading them). /// Parameters: - /// `encrypted_in_backup` specify if this file is encrypted in the backup, so it shouldn't be encrypted again while restoring to an encrypted disk. + /// `encrypted_in_backup` specify if this file is encrypted in the backup, so it shouldn't be encrypted again while restoring to an encrypted disk. virtual void copyFileToDisk(const String & path_in_backup, size_t file_size, bool encrypted_in_backup, DiskPtr destination_disk, const String & destination_path, WriteMode write_mode) = 0; - + virtual const ReadSettings & getReadSettings() const = 0; virtual const WriteSettings & getWriteSettings() const = 0; virtual size_t getWriteBufferSize() const = 0; diff --git a/src/Backups/BackupIO_Default.h b/src/Backups/BackupIO_Default.h index 0fc510f9361..ad7bdf15d9f 100644 --- a/src/Backups/BackupIO_Default.h +++ b/src/Backups/BackupIO_Default.h @@ -25,10 +25,10 @@ public: /// The function copyFileToDisk() can be much faster than reading the file with readFile() and then writing it to some disk. /// (especially for S3 where it can use CopyObject to copy objects inside S3 instead of downloading and uploading them). /// Parameters: - /// `encrypted_in_backup` specify if this file is encrypted in the backup, so it shouldn't be encrypted again while restoring to an encrypted disk. + /// `encrypted_in_backup` specify if this file is encrypted in the backup, so it shouldn't be encrypted again while restoring to an encrypted disk. void copyFileToDisk(const String & path_in_backup, size_t file_size, bool encrypted_in_backup, DiskPtr destination_disk, const String & destination_path, WriteMode write_mode) override; - + const ReadSettings & getReadSettings() const override { return read_settings; } const WriteSettings & getWriteSettings() const override { return write_settings; } size_t getWriteBufferSize() const override { return write_buffer_size; } diff --git a/src/Backups/BackupIO_Disk.cpp b/src/Backups/BackupIO_Disk.cpp index 1e1af63cdc2..b58aa1832a5 100644 --- a/src/Backups/BackupIO_Disk.cpp +++ b/src/Backups/BackupIO_Disk.cpp @@ -8,11 +8,6 @@ namespace DB { -namespace ErrorCodes -{ - extern const int LOGICAL_ERROR; -} - BackupReaderDisk::BackupReaderDisk(const DiskPtr & disk_, const String & root_path_, const ContextPtr & context_) : BackupReaderDefault(&Poco::Logger::get("BackupReaderDisk"), context_) , disk(disk_) diff --git a/src/Backups/BackupIO_File.cpp b/src/Backups/BackupIO_File.cpp index 649637e567d..eb079623919 100644 --- a/src/Backups/BackupIO_File.cpp +++ b/src/Backups/BackupIO_File.cpp @@ -11,6 +11,11 @@ namespace fs = std::filesystem; namespace DB { +namespace ErrorCodes +{ + extern const int LOGICAL_ERROR; +} + BackupReaderFile::BackupReaderFile(const String & root_path_, const ContextPtr & context_) : BackupReaderDefault(&Poco::Logger::get("BackupReaderFile"), context_) , root_path(root_path_) diff --git a/src/Backups/IBackupEntry.h b/src/Backups/IBackupEntry.h index 249c290cbe7..ca176c740c0 100644 --- a/src/Backups/IBackupEntry.h +++ b/src/Backups/IBackupEntry.h @@ -33,7 +33,7 @@ public: /// Returns true if the data returned by getReadBuffer() is encrypted by an encrypted disk. virtual bool isEncryptedByDisk() const { return false; } - /// Returns information about disk and file if this backup entry is generated from a file. + /// Returns information about disk and file if this backup entry is generated from a file. virtual bool isFromFile() const { return false; } virtual bool isFromImmutableFile() const { return false; } virtual String getFilePath() const { return ""; }