Merge pull request ClickHouse#8384 from ClickHouse/avoid-std-terminat…

…e-in-write-buffers Avoid std::terminate in write buffers
vitlibar · Dec 24, 2019 · c949eb5 · c949eb5
2 parents d029ee3 + 8d190e6
commit c949eb5
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 12 deletions.
diff --git a/dbms/src/IO/BrotliWriteBuffer.cpp b/dbms/src/IO/BrotliWriteBuffer.cpp
@@ -46,7 +46,14 @@ BrotliWriteBuffer::BrotliWriteBuffer(WriteBuffer & out_, int compression_level,
 
 BrotliWriteBuffer::~BrotliWriteBuffer()
 {
-    finish();
+    try
+    {
+        finish();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
 }
 
 void BrotliWriteBuffer::nextImpl()

diff --git a/dbms/src/IO/WriteBufferFromFileBase.cpp b/dbms/src/IO/WriteBufferFromFileBase.cpp
@@ -8,10 +8,6 @@ WriteBufferFromFileBase::WriteBufferFromFileBase(size_t buf_size, char * existin
 {
 }
 
-WriteBufferFromFileBase::~WriteBufferFromFileBase()
-{
-}
-
 off_t WriteBufferFromFileBase::seek(off_t off, int whence)
 {
     return doSeek(off, whence);

diff --git a/dbms/src/IO/WriteBufferFromFileBase.h b/dbms/src/IO/WriteBufferFromFileBase.h
@@ -13,12 +13,12 @@ class WriteBufferFromFileBase : public BufferWithOwnMemory<WriteBuffer>
 {
 public:
     WriteBufferFromFileBase(size_t buf_size, char * existing_memory, size_t alignment);
-    virtual ~WriteBufferFromFileBase();
+    ~WriteBufferFromFileBase() override = default;
 
     off_t seek(off_t off, int whence = SEEK_SET);
     void truncate(off_t length = 0);
     virtual off_t getPositionInFile() = 0;
-    virtual void sync() = 0;
+    void sync() override = 0;
     virtual std::string getFileName() const = 0;
     virtual int getFD() const = 0;
 

diff --git a/dbms/src/IO/WriteBufferFromVector.h b/dbms/src/IO/WriteBufferFromVector.h
@@ -89,8 +89,14 @@ class WriteBufferFromVector : public WriteBuffer
 
     ~WriteBufferFromVector() override
     {
-        if (!is_finished)
+        try
+        {
             finish();
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
     }
 };
 

diff --git a/dbms/src/IO/WriteBufferValidUTF8.cpp b/dbms/src/IO/WriteBufferValidUTF8.cpp
@@ -133,4 +133,17 @@ void WriteBufferValidUTF8::finish()
         putReplacement();
 }
 
+
+WriteBufferValidUTF8::~WriteBufferValidUTF8()
+{
+    try
+    {
+        finish();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
 }
diff --git a/dbms/src/IO/WriteBufferValidUTF8.h b/dbms/src/IO/WriteBufferValidUTF8.h
@@ -35,10 +35,7 @@ class WriteBufferValidUTF8 : public BufferWithOwnMemory<WriteBuffer>
         const char * replacement_ = "\xEF\xBF\xBD",
         size_t size = DEFAULT_SIZE);
 
-    virtual ~WriteBufferValidUTF8() override
-    {
-        finish();
-    }
+    ~WriteBufferValidUTF8() override;
 };
 
 }