diff --git a/.clang-tidy b/.clang-tidy
index b0971418e0e..ecb8ac6dcbf 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -203,3 +203,5 @@ CheckOptions:
     value: CamelCase
   - key: readability-identifier-naming.UsingCase
     value: CamelCase
+  - key: modernize-loop-convert.UseCxx20ReverseRanges
+    value: false
diff --git a/src/Compression/CompressionCodecEncrypted.cpp b/src/Compression/CompressionCodecEncrypted.cpp
index 6b921fb9c0a..ba3f12c32a0 100644
--- a/src/Compression/CompressionCodecEncrypted.cpp
+++ b/src/Compression/CompressionCodecEncrypted.cpp
@@ -113,7 +113,7 @@ namespace DB
 
     std::string CompressionCodecEncrypted::deriveKey(const std::string_view & master_key)
     {
-        std::string_view salt(""); // No salt: derive keys in a deterministic manner.
+        std::string_view salt; // No salt: derive keys in a deterministic manner.
         std::string_view info("Codec Encrypted('AES-128-GCM-SIV') key generation key");
         std::array<char, 32> result;
 
diff --git a/src/IO/WriteBufferFromFile.cpp b/src/IO/WriteBufferFromFile.cpp
index 67cd7ba27d6..270882d0774 100644
--- a/src/IO/WriteBufferFromFile.cpp
+++ b/src/IO/WriteBufferFromFile.cpp
@@ -32,7 +32,7 @@ WriteBufferFromFile::WriteBufferFromFile(
     mode_t mode,
     char * existing_memory,
     size_t alignment)
-    : WriteBufferFromFileDescriptor(-1, buf_size, existing_memory, alignment), file_name(file_name_)
+    : WriteBufferFromFileDescriptor(-1, buf_size, existing_memory, alignment, file_name_)
 {
     ProfileEvents::increment(ProfileEvents::FileOpen);
 
@@ -65,9 +65,7 @@ WriteBufferFromFile::WriteBufferFromFile(
     size_t buf_size,
     char * existing_memory,
     size_t alignment)
-    :
-    WriteBufferFromFileDescriptor(fd_, buf_size, existing_memory, alignment),
-    file_name(original_file_name.empty() ? "(fd = " + toString(fd_) + ")" : original_file_name)
+    : WriteBufferFromFileDescriptor(fd_, buf_size, existing_memory, alignment, original_file_name)
 {
     fd_ = -1;
 }
diff --git a/src/IO/WriteBufferFromFile.h b/src/IO/WriteBufferFromFile.h
index b7d58638113..584a0221f1a 100644
--- a/src/IO/WriteBufferFromFile.h
+++ b/src/IO/WriteBufferFromFile.h
@@ -25,7 +25,6 @@ namespace DB
 class WriteBufferFromFile : public WriteBufferFromFileDescriptor
 {
 protected:
-    std::string file_name;
     CurrentMetrics::Increment metric_increment{CurrentMetrics::OpenFileForWrite};
 
 public:
diff --git a/src/IO/WriteBufferFromFileDescriptor.cpp b/src/IO/WriteBufferFromFileDescriptor.cpp
index cd265653bb9..f1afca171d2 100644
--- a/src/IO/WriteBufferFromFileDescriptor.cpp
+++ b/src/IO/WriteBufferFromFileDescriptor.cpp
@@ -61,7 +61,9 @@ void WriteBufferFromFileDescriptor::nextImpl()
         if ((-1 == res || 0 == res) && errno != EINTR)
         {
             ProfileEvents::increment(ProfileEvents::WriteBufferFromFileDescriptorWriteFailed);
-            throwFromErrnoWithPath("Cannot write to file " + getFileName(), getFileName(),
+
+            /// Don't use getFileName() here because this method can be called from destructor
+            throwFromErrnoWithPath("Cannot write to file " + file_name, file_name,
                                    ErrorCodes::CANNOT_WRITE_TO_FILE_DESCRIPTOR);
         }
 
@@ -74,19 +76,17 @@ void WriteBufferFromFileDescriptor::nextImpl()
 }
 
 
-/// Name or some description of file.
-std::string WriteBufferFromFileDescriptor::getFileName() const
-{
-    return "(fd = " + toString(fd) + ")";
-}
-
-
 WriteBufferFromFileDescriptor::WriteBufferFromFileDescriptor(
     int fd_,
     size_t buf_size,
     char * existing_memory,
-    size_t alignment)
-    : WriteBufferFromFileBase(buf_size, existing_memory, alignment), fd(fd_) {}
+    size_t alignment,
+    const std::string & file_name_)
+    : WriteBufferFromFileBase(buf_size, existing_memory, alignment)
+    , fd(fd_)
+    , file_name(file_name_.empty() ? "(fd = " + toString(fd) + ")" : file_name_)
+{
+}
 
 
 WriteBufferFromFileDescriptor::~WriteBufferFromFileDescriptor()
@@ -115,7 +115,7 @@ void WriteBufferFromFileDescriptor::sync()
 }
 
 
-off_t WriteBufferFromFileDescriptor::seek(off_t offset, int whence)
+off_t WriteBufferFromFileDescriptor::seek(off_t offset, int whence) // NOLINT
 {
     off_t res = lseek(fd, offset, whence);
     if (-1 == res)
@@ -125,7 +125,7 @@ off_t WriteBufferFromFileDescriptor::seek(off_t offset, int whence)
 }
 
 
-void WriteBufferFromFileDescriptor::truncate(off_t length)
+void WriteBufferFromFileDescriptor::truncate(off_t length) // NOLINT
 {
     int res = ftruncate(fd, length);
     if (-1 == res)
@@ -133,7 +133,7 @@ void WriteBufferFromFileDescriptor::truncate(off_t length)
 }
 
 
-off_t WriteBufferFromFileDescriptor::size()
+off_t WriteBufferFromFileDescriptor::size() const
 {
     struct stat buf;
     int res = fstat(fd, &buf);
diff --git a/src/IO/WriteBufferFromFileDescriptor.h b/src/IO/WriteBufferFromFileDescriptor.h
index 18c0ac64f63..aef332b38b0 100644
--- a/src/IO/WriteBufferFromFileDescriptor.h
+++ b/src/IO/WriteBufferFromFileDescriptor.h
@@ -13,17 +13,17 @@ class WriteBufferFromFileDescriptor : public WriteBufferFromFileBase
 protected:
     int fd;
 
+    /// If file has name contains filename, otherwise contains string "(fd=...)"
+    std::string file_name;
+
     void nextImpl() override;
-
-    /// Name or some description of file.
-    std::string getFileName() const override;
-
 public:
     WriteBufferFromFileDescriptor(
         int fd_ = -1,
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         char * existing_memory = nullptr,
-        size_t alignment = 0);
+        size_t alignment = 0,
+        const std::string & file_name_ = "");
 
     /** Could be used before initialization if needed 'fd' was not passed to constructor.
       * It's not possible to change 'fd' during work.
@@ -42,10 +42,19 @@ public:
 
     void sync() override;
 
-    off_t seek(off_t offset, int whence);
-    void truncate(off_t length);
+    /// clang-tidy wants these methods to be const, but
+    /// they are not const semantically
+    off_t seek(off_t offset, int whence); // NOLINT
+    void truncate(off_t length); // NOLINT
 
-    off_t size();
+    /// Name or some description of file.
+    std::string getFileName() const override
+    {
+        return file_name;
+    }
+
+
+    off_t size() const;
 };
 
 }