Merge pull request #52862 from Avogar/local-assert

Fix possible assert in ~PushingAsyncPipelineExecutor in clickhouse-local

src/Client/LocalConnection.cpp

@@ -35,6 +35,18 @@ LocalConnection::LocalConnection(ContextPtr context_, bool send_progress_, bool
 
 LocalConnection::~LocalConnection()
 {
+    /// Last query may not have been finished or cancelled due to exception on client side.
+    if (state && !state->is_finished && !state->is_cancelled)
+    {
+        try
+        {
+            LocalConnection::sendCancel();
+        }
+        catch (...)
+        {
+            /// Just ignore any exception.
+        }
+    }
     state.reset();
 }
 
@@ -73,6 +85,10 @@ void LocalConnection::sendQuery(
     bool,
     std::function<void(const Progress &)> process_progress_callback)
 {
+    /// Last query may not have been finished or cancelled due to exception on client side.
+    if (state && !state->is_finished && !state->is_cancelled)
+        sendCancel();
+
     /// Suggestion comes without client_info.
     if (client_info)
         query_context = session.makeQueryContext(*client_info);
@@ -204,6 +220,10 @@ void LocalConnection::sendCancel()
     state->is_cancelled = true;
     if (state->executor)
         state->executor->cancel();
+    if (state->pushing_executor)
+        state->pushing_executor->cancel();
+    if (state->pushing_async_executor)
+        state->pushing_async_executor->cancel();
 }
 
 bool LocalConnection::pullBlock(Block & block)

tests/queries/0_stateless/02841_local_assert.reference

@@ -0,0 +1 @@
+1

tests/queries/0_stateless/02841_local_assert.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -e
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+echo "create table test (x UInt64) engine=Memory;
+insert into test from infile 'data'; -- {clientError BAD_ARGUMENTS}" | $CLICKHOUSE_LOCAL -nm 
+
+echo "create table test (x UInt64) engine=Memory;
+insert into test from infile 'data';" | $CLICKHOUSE_LOCAL -nm --ignore-error
+
+echo "create table test (x UInt64) engine=Memory;
+insert into test from infile 'data'; -- {clientError BAD_ARGUMENTS}
+select 1" | $CLICKHOUSE_LOCAL -nm 
+