thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow to use database.table in right hand side of IN, JOIN [#CLICKHOUSE-3144].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-07-14 04:00:29 +03:00
parent 4a5fb9eb7b
commit 9bb902c3ef
3 changed files with 58 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dbms/src/Interpreters/ExpressionAnalyzer.cpp
View File

@ -1409,6 +1409,22 @@ void ExpressionAnalyzer::makeSetsForIndexImpl(ASTPtr & node, const Block & sampl
}
static std::pair<String, String> getDatabaseAndTableNameFromIdentifier(const ASTIdentifier & identifier)
{
std::pair<String, String> res;
res.second = identifier.name;
if (!identifier.children.empty())
{
if (identifier.children.size() != 2)
throw Exception("Qualified table name could have only two components", ErrorCodes::LOGICAL_ERROR);
res.first = typeid_cast<const ASTIdentifier &>(*identifier.children[0]).name;
res.second = typeid_cast<const ASTIdentifier &>(*identifier.children[1]).name;
}
return res;
}
static std::shared_ptr<InterpreterSelectQuery> interpretSubquery(
ASTPtr & subquery_or_table_name, const Context & context, size_t subquery_depth, const Names & required_columns)
{
@ -1446,7 +1462,8 @@ static std::shared_ptr<InterpreterSelectQuery> interpretSubquery(
select_query->children.emplace_back(select_query->select_expression_list);
/// get columns list for target table
const auto & storage = context.getTable("", table->name);
auto database_table = getDatabaseAndTableNameFromIdentifier(*table);
const auto & storage = context.getTable(database_table.first, database_table.second);
const auto & columns = storage->getColumnsListNonMaterialized();
select_expression_list->children.reserve(columns.size());
@ -1455,7 +1472,7 @@ static std::shared_ptr<InterpreterSelectQuery> interpretSubquery(
select_expression_list->children.emplace_back(std::make_shared<ASTIdentifier>(
StringRange{}, column.name));
select_query->replaceDatabaseAndTable("", table->name);
select_query->replaceDatabaseAndTable(database_table.first, database_table.second);
}
else
{
@ -1528,11 +1545,12 @@ void ExpressionAnalyzer::makeSet(ASTFunction * node, const Block & sample_block)
auto ast_set = std::make_shared<ASTSet>(set_id);
ASTPtr ast_set_ptr = ast_set;
/// A special case is if the name of the table is specified on the right side of the IN statement, and the table has the type Set (a previously prepared set).
/// TODO This syntax does not support the specification of the database name.
/// A special case is if the name of the table is specified on the right side of the IN statement,
/// and the table has the type Set (a previously prepared set).
if (identifier)
{
StoragePtr table = context.tryGetTable("", identifier->name);
auto database_table = getDatabaseAndTableNameFromIdentifier(*identifier);
StoragePtr table = context.tryGetTable(database_table.first, database_table.second);
if (table)
{
@ -2382,7 +2400,8 @@ bool ExpressionAnalyzer::appendJoin(ExpressionActionsChain & chain, bool only_ty
/// TODO This syntax does not support specifying a database name.
if (table_to_join.database_and_table_name)
{
StoragePtr table = context.tryGetTable("", static_cast<const ASTIdentifier &>(*table_to_join.database_and_table_name).name);
auto database_table = getDatabaseAndTableNameFromIdentifier(static_cast<const ASTIdentifier &>(*table_to_join.database_and_table_name));
StoragePtr table = context.tryGetTable(database_table.first, database_table.second);
if (table)
{
@ -2779,7 +2798,8 @@ void ExpressionAnalyzer::collectJoinedColumns(NameSet & joined_columns, NamesAnd
Block nested_result_sample;
if (table_expression.database_and_table_name)
{
const auto & table = context.getTable("", static_cast<const ASTIdentifier &>(*table_expression.database_and_table_name).name);
auto database_table = getDatabaseAndTableNameFromIdentifier(static_cast<const ASTIdentifier &>(*table_expression.database_and_table_name));
const auto & table = context.getTable(database_table.first, database_table.second);
nested_result_sample = table->getSampleBlockNonMaterialized();
}
else if (table_expression.subquery)

8
dbms/tests/queries/0_stateless/00475_in_join_db_table.reference Normal file
View File

@ -0,0 +1,8 @@
1 hello
0 world
1 hello
0 world
1 hello
2
1 hello
2

23
dbms/tests/queries/0_stateless/00475_in_join_db_table.sql Normal file
View File

@ -0,0 +1,23 @@
DROP TABLE IF EXISTS test.set;
CREATE TABLE test.set (x String) ENGINE = Memory;
INSERT INTO test.set VALUES ('hello');
SELECT (arrayJoin(['hello', 'world']) AS s) IN test.set, s;
DROP TABLE test.set;
CREATE TABLE test.set (x String) ENGINE = Set;
INSERT INTO test.set VALUES ('hello');
SELECT (arrayJoin(['hello', 'world']) AS s) IN test.set, s;
DROP TABLE test.set;
DROP TABLE IF EXISTS test.join;
CREATE TABLE test.join (k UInt8, x String) ENGINE = Memory;
INSERT INTO test.join VALUES (1, 'hello');
SELECT k, x FROM (SELECT arrayJoin([1, 2]) AS k) ANY LEFT JOIN test.join USING k;
DROP TABLE test.join;
CREATE TABLE test.join (k UInt8, x String) ENGINE = Join(ANY, LEFT, k);
INSERT INTO test.join VALUES (1, 'hello');
SELECT k, x FROM (SELECT arrayJoin([1, 2]) AS k) ANY LEFT JOIN test.join USING k;
DROP TABLE test.join;