Proper destruction of task

amosbird · amosbird · commit 052281896ae4 · 2023-08-19T13:56:57.000+08:00
diff --git a/src/Processors/Sources/ShellCommandSource.cpp b/src/Processors/Sources/ShellCommandSource.cpp
@@ -266,7 +266,7 @@ namespace
         {
             for (auto && send_data_task : send_data_tasks)
             {
-                send_data_threads.emplace_back([task = std::move(send_data_task), this]()
+                send_data_threads.emplace_back([task = std::move(send_data_task), this]() mutable
                 {
                     try
                     {
@@ -276,6 +276,10 @@ namespace
                     {
                         std::lock_guard lock(send_data_lock);
                         exception_during_send_data = std::current_exception();
+
+                        /// task should be reset inside catch block or else it breaks d'tor
+                        /// invariants such as in ~WriteBuffer.
+                        task = {};
                     }
                 });
             }

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ namespace`
`266`	`266`	`{`
`267`	`267`	`for (auto && send_data_task : send_data_tasks)`
`268`	`268`	`{`
`269`		`- send_data_threads.emplace_back([task = std::move(send_data_task), this]()`
	`269`	`+ send_data_threads.emplace_back([task = std::move(send_data_task), this]() mutable`
`270`	`270`	`{`
`271`	`271`	`try`
`272`	`272`	`{`
`@@ -276,6 +276,10 @@ namespace`
`276`	`276`	`{`
`277`	`277`	`std::lock_guard lock(send_data_lock);`
`278`	`278`	`exception_during_send_data = std::current_exception();`
	`279`	`+`
	`280`	`+ /// task should be reset inside catch block or else it breaks d'tor`
	`281`	`+ /// invariants such as in ~WriteBuffer.`
	`282`	`+ task = {};`
`279`	`283`	`}`
`280`	`284`	`});`
`281`	`285`	`}`