thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 23:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbms: Fixed accidentially introduced error [#METR-10377].

Browse Source
This commit is contained in:
Alexey Milovidov 2014-03-12 22:20:03 +04:00
parent 34ef806287
commit b8218d64b8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbms/include/DB/Columns/ColumnSet.h
View File

@ -16,6 +16,9 @@ class ColumnSet : public IColumnDummy
public: public:
ColumnSet(size_t s_, SetPtr data_) : IColumnDummy(s_), data(data_) {} ColumnSet(size_t s_, SetPtr data_) : IColumnDummy(s_), data(data_) {}
/// Столбец не константный. Иначе столбец будет использоваться в вычислениях в ExpressionActions::prepare, когда множество из подзапроса ещё не готово.
bool isConst() const { return false; }
std::string getName() const { return "ColumnSet"; } std::string getName() const { return "ColumnSet"; }
ColumnPtr cloneDummy(size_t s_) const { return new ColumnSet(s_, data); } ColumnPtr cloneDummy(size_t s_) const { return new ColumnSet(s_, data); }

1
dbms/include/DB/Common/VirtualColumnUtils.h
View File

@ -10,7 +10,6 @@
#include <DB/Parsers/ASTLiteral.h> #include <DB/Parsers/ASTLiteral.h>
#include <DB/Parsers/ASTSelectQuery.h> #include <DB/Parsers/ASTSelectQuery.h>
#include <DB/Storages/StoragePtr.h> #include <DB/Storages/StoragePtr.h>
#include <DB/Interpreters/InterpreterSelectQuery.h>
#include <DB/Columns/ColumnString.h> #include <DB/Columns/ColumnString.h>
namespace DB namespace DB

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

@ -1229,9 +1229,7 @@ Sets ExpressionAnalyzer::getSetsWithSubqueries()
{ {
Sets res; Sets res;
for (auto & s : sets_with_subqueries) for (auto & s : sets_with_subqueries)
{
res.push_back(s.second); res.push_back(s.second);
}
return res; return res;
} }