mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-25 17:12:03 +00:00
remove error prone code
This commit is contained in:
parent
a17cefb9c6
commit
12b57aedf0
@ -204,21 +204,6 @@ void AnalyzedJoin::addJoinedColumnsAndCorrectNullability(Block & sample_block) c
|
|||||||
|
|
||||||
bool make_nullable = join_use_nulls && left_or_full_join;
|
bool make_nullable = join_use_nulls && left_or_full_join;
|
||||||
|
|
||||||
if (!make_nullable)
|
|
||||||
{
|
|
||||||
/// Keys from right table are usually not stored in Join, but copied from the left one.
|
|
||||||
/// So, if left key is nullable, let's make right key nullable too.
|
|
||||||
/// Note: for some join types it's not needed and, probably, may be removed.
|
|
||||||
/// Note: changing this code, take into account the implementation in Join.cpp.
|
|
||||||
auto it = std::find(key_names_right.begin(), key_names_right.end(), col.name);
|
|
||||||
if (it != key_names_right.end())
|
|
||||||
{
|
|
||||||
auto pos = it - key_names_right.begin();
|
|
||||||
const auto & left_key_name = key_names_left[pos];
|
|
||||||
make_nullable = sample_block.getByName(left_key_name).type->isNullable();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (make_nullable && res_type->canBeInsideNullable())
|
if (make_nullable && res_type->canBeInsideNullable())
|
||||||
res_type = makeNullable(res_type);
|
res_type = makeNullable(res_type);
|
||||||
|
|
||||||
|
@ -94,7 +94,7 @@ public:
|
|||||||
void addOnKeys(ASTPtr & left_table_ast, ASTPtr & right_table_ast);
|
void addOnKeys(ASTPtr & left_table_ast, ASTPtr & right_table_ast);
|
||||||
|
|
||||||
bool hasUsing() const { return table_join.using_expression_list != nullptr; }
|
bool hasUsing() const { return table_join.using_expression_list != nullptr; }
|
||||||
bool hasOn() const { return !hasUsing(); }
|
bool hasOn() const { return table_join.on_expression != nullptr; }
|
||||||
|
|
||||||
NameSet getQualifiedColumnsSet() const;
|
NameSet getQualifiedColumnsSet() const;
|
||||||
NameSet getOriginalColumnsSet() const;
|
NameSet getOriginalColumnsSet() const;
|
||||||
|
Loading…
Reference in New Issue
Block a user