revert squashing_transform in HashJoinProbeBlockInputStream

---- merge output blocks if need in hash join pingcap#6529 816b8d5 ----
solotzg · Feb 1, 2023 · 153f6f5 · 153f6f5
1 parent 4fdc99c
commit 153f6f5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/dbms/src/DataStreams/HashJoinProbeBlockInputStream.cpp b/dbms/src/DataStreams/HashJoinProbeBlockInputStream.cpp
@@ -26,7 +26,6 @@ HashJoinProbeBlockInputStream::HashJoinProbeBlockInputStream(
     , join(join_)
     , probe_index(probe_index_)
     , probe_process_info(max_block_size)
-    , squashing_transform(max_block_size)
 {
     children.push_back(input);
 
@@ -85,18 +84,7 @@ Block HashJoinProbeBlockInputStream::readImpl()
 {
     try
     {
-        // if join finished, return {} directly.
-        if (squashing_transform.isJoinFinished())
-        {
-            return Block{};
-        }
-
-        while (squashing_transform.needAppendBlock())
-        {
-            Block result_block = getOutputBlock();
-            squashing_transform.appendBlock(result_block);
-        }
-        auto ret = squashing_transform.getFinalOutputBlock();
+        Block ret = getOutputBlock();
         return ret;
     }
     catch (...)

diff --git a/dbms/src/DataStreams/HashJoinProbeBlockInputStream.h b/dbms/src/DataStreams/HashJoinProbeBlockInputStream.h
@@ -66,7 +66,6 @@ class HashJoinProbeBlockInputStream : public IProfilingBlockInputStream
     size_t probe_index;
     ProbeProcessInfo probe_process_info;
     BlockInputStreamPtr non_joined_stream;
-    SquashingHashJoinBlockTransform squashing_transform;
     ProbeStatus status{ProbeStatus::PROBE};
     size_t joined_rows = 0;
     size_t non_joined_rows = 0;