move JoinCommon funcs out of IJoin.h/cpp

dbms/src/Interpreters/IJoin.h

@@ -10,10 +10,7 @@
 namespace DB
 {
 
-struct ColumnWithTypeAndName;
 class Block;
-class IColumn;
-using ColumnRawPtrs = std::vector<const IColumn *>;
 
 class IJoin
 {
@@ -39,24 +36,4 @@ public:
 
 using JoinPtr = std::shared_ptr<IJoin>;
 
-
-namespace JoinCommon
-{
-
-void convertColumnToNullable(ColumnWithTypeAndName & column);
-void convertColumnsToNullable(Block & block, size_t starting_pos = 0);
-ColumnRawPtrs temporaryMaterializeColumns(const Block & block, const Names & names, Columns & materialized);
-void removeLowCardinalityInplace(Block & block);
-
-/// Split key and other columns by keys name list
-ColumnRawPtrs extractKeysForJoin(const Names & key_names_right, const Block & right_sample_block,
-                                 Block & sample_block_with_keys, Block & sample_block_with_columns_to_add);
-
-/// Throw an exception if blocks have different types of key columns. Compare up to Nullability.
-void checkTypesOfKeys(const Block & block_left, const Names & key_names_left, const Block & block_right, const Names & key_names_right);
-
-void createMissedColumns(Block & block);
-
-}
-
 }

dbms/src/Interpreters/Join.cpp

@@ -10,6 +10,7 @@
 #include <DataTypes/DataTypeNullable.h>
 
 #include <Interpreters/Join.h>
+#include <Interpreters/join_common.h>
 #include <Interpreters/AnalyzedJoin.h>
 #include <Interpreters/joinDispatch.h>
 #include <Interpreters/NullableUtils.h>
@@ -249,7 +250,9 @@ size_t Join::getTotalByteCount() const
 
 void Join::setSampleBlock(const Block & block)
 {
+    /// You have to restore this lock if you call the fuction outside of ctor.
     //std::unique_lock lock(rwlock);
+
     LOG_DEBUG(log, "setSampleBlock: " << block.dumpStructure());
 
     if (!empty())

dbms/src/Interpreters/MergeJoin.cpp

@@ -4,6 +4,7 @@
 #include <Interpreters/MergeJoin.h>
 #include <Interpreters/AnalyzedJoin.h>
 #include <Interpreters/sortBlock.h>
+#include <Interpreters/join_common.h>
 #include <DataStreams/materializeBlock.h>
 #include <DataStreams/MergeSortingBlockInputStream.h>
 

dbms/src/Interpreters/IJoin.cpp → dbms/src/Interpreters/join_common.cpp

-#include <Interpreters/IJoin.h>
+#include <Interpreters/join_common.h>
 #include <Columns/ColumnNullable.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeLowCardinality.h>

dbms/src/Interpreters/join_common.h

+#pragma once
+
+#include <Interpreters/IJoin.h>
+
+namespace DB
+{
+
+struct ColumnWithTypeAndName;
+class Block;
+class IColumn;
+using ColumnRawPtrs = std::vector<const IColumn *>;
+
+namespace JoinCommon
+{
+
+void convertColumnToNullable(ColumnWithTypeAndName & column);
+void convertColumnsToNullable(Block & block, size_t starting_pos = 0);
+ColumnRawPtrs temporaryMaterializeColumns(const Block & block, const Names & names, Columns & materialized);
+void removeLowCardinalityInplace(Block & block);
+
+/// Split key and other columns by keys name list
+ColumnRawPtrs extractKeysForJoin(const Names & key_names_right, const Block & right_sample_block,
+                                 Block & sample_block_with_keys, Block & sample_block_with_columns_to_add);
+
+/// Throw an exception if blocks have different types of key columns. Compare up to Nullability.
+void checkTypesOfKeys(const Block & block_left, const Names & key_names_left, const Block & block_right, const Names & key_names_right);
+
+void createMissedColumns(Block & block);
+
+}
+
+}