Fix error

alexey-milovidov · alexey-milovidov · commit fca4f9584e01 · 2025-01-01T22:24:40.000+01:00
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
@@ -578,10 +578,8 @@ void PrettyBlockOutputFormat::stopThread()
 {
     if (thread)
     {
-        {
-            finish = true;
-            mono_chunk_condvar.notify_one();
-        }
+        finish = true;
+        mono_chunk_condvar.notify_one();
     }
 }
 
@@ -591,7 +589,6 @@ PrettyBlockOutputFormat::~PrettyBlockOutputFormat()
     {
         stopThread();
         thread->join();
-        thread.reset();
     }
 }
 
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
@@ -80,7 +80,7 @@ class PrettyBlockOutputFormat : public IOutputFormat
     /// Implements squashing of chunks by time
     std::condition_variable mono_chunk_condvar;
     std::optional<ThreadFromGlobalPool> thread;
-    bool finish = false;
+    std::atomic_bool finish{false};
     void writingThread();
     void stopThread();
 };

Original file line number	Diff line number	Diff line change
`@@ -578,10 +578,8 @@ void PrettyBlockOutputFormat::stopThread()`
`578`	`578`	`{`
`579`	`579`	`if (thread)`
`580`	`580`	`{`
`581`		`- {`
`582`		`- finish = true;`
`583`		`- mono_chunk_condvar.notify_one();`
`584`		`- }`
	`581`	`+ finish = true;`
	`582`	`+ mono_chunk_condvar.notify_one();`
`585`	`583`	`}`
`586`	`584`	`}`
`587`	`585`
`@@ -591,7 +589,6 @@ PrettyBlockOutputFormat::~PrettyBlockOutputFormat()`
`591`	`589`	`{`
`592`	`590`	`stopThread();`
`593`	`591`	`thread->join();`
`594`		`- thread.reset();`
`595`	`592`	`}`
`596`	`593`	`}`
`597`	`594`