From ce372f464bf21efe1207a0bc246072344667ad41 Mon Sep 17 00:00:00 2001
From: Artem Zuikov <chertus@gmail.com>
Date: Thu, 16 Apr 2020 21:03:27 +0300
Subject: [PATCH] Fix finalize chain logic in ExpressionAnalysisResult (#10302)

---
 src/Interpreters/ExpressionAnalyzer.cpp       |  8 ++++---
 .../01117_chain_finalize_bug.reference        |  9 +++++++
 .../0_stateless/01117_chain_finalize_bug.sql  | 24 +++++++++++++++++++
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 tests/queries/0_stateless/01117_chain_finalize_bug.reference
 create mode 100644 tests/queries/0_stateless/01117_chain_finalize_bug.sql

diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index 9ec32737fdc..bb2553c76a4 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -963,13 +963,15 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
 
     auto finalize_chain = [&](ExpressionActionsChain & chain)
     {
+        chain.finalize();
+
         if (!finalized)
         {
-            chain.finalize();
             finalize(chain, context, where_step_num);
-            chain.clear();
+            finalized = true;
         }
-        finalized = true;
+
+        chain.clear();
     };
 
     {
diff --git a/tests/queries/0_stateless/01117_chain_finalize_bug.reference b/tests/queries/0_stateless/01117_chain_finalize_bug.reference
new file mode 100644
index 00000000000..5704c399b5c
--- /dev/null
+++ b/tests/queries/0_stateless/01117_chain_finalize_bug.reference
@@ -0,0 +1,9 @@
+1	0
+1	1
+2	0
+2	1
+1	0
+1	1
+2	0
+2	1
+200000
diff --git a/tests/queries/0_stateless/01117_chain_finalize_bug.sql b/tests/queries/0_stateless/01117_chain_finalize_bug.sql
new file mode 100644
index 00000000000..f79f82b8d4d
--- /dev/null
+++ b/tests/queries/0_stateless/01117_chain_finalize_bug.sql
@@ -0,0 +1,24 @@
+SELECT arrayJoin(arrayMap(i -> (i + 1), range(2))) AS index, number
+FROM numbers(2)
+GROUP BY number
+ORDER BY index, number;
+
+SET max_bytes_before_external_group_by = 1;
+
+SELECT arrayJoin(arrayMap(i -> (i + 1), range(2))) AS index, number
+FROM numbers(2)
+GROUP BY number
+ORDER BY index, number;
+
+SET group_by_two_level_threshold = 2;
+
+SELECT count() FROM
+(
+    SELECT 
+        arrayJoin(arrayMap(i -> (i + 1), range(2))) AS index, 
+        number
+    FROM numbers_mt(100000)
+    GROUP BY number
+    ORDER BY index ASC
+    SETTINGS max_block_size = 100000, max_threads = 2
+);