thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-23 02:00:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

clickhouse: fixed build [#CONV-6788].

Browse Source
This commit is contained in:
Michael Kolupaev 2013-03-06 13:56:11 +00:00
parent 35023d04b8
commit a46833bbeb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/include/DB/Columns/ColumnConst.h
View File

@ -127,8 +127,8 @@ typedef ColumnConst<Array> ColumnConstArray;
template <typename T> ColumnConst<T>::ColumnConst(size_t s_, const T & data_) : s(s_), data(data_) {}
template <typename T> ColumnConst<T>::ColumnConst(size_t s_, const T & data_, DataTypePtr nested_type_) { throw Exception("Can't create non-array ColumnConst with nested type", ErrorCodes::LOGICAL_ERROR); }
template <> ColumnConst<Array>::ColumnConst(size_t s_, const Array & data_) { throw Exception("Can't create ColumnConst<Array> without nested type", ErrorCodes::LOGICAL_ERROR); }
template <> ColumnConst<Array>::ColumnConst(size_t s_, const Array & data_, DataTypePtr nested_type_) : s(s_), data(data_), nested_type(nested_type_) {}
template <> ColumnConst<Array>::ColumnConst(size_t s_, const Array & data_);
template <> ColumnConst<Array>::ColumnConst(size_t s_, const Array & data_, DataTypePtr nested_type_);
template <typename T> ColumnPtr ColumnConst<T>::convertToFullColumn() const

5
dbms/src/Columns/ColumnConst.cpp
View File

@ -7,6 +7,10 @@
namespace DB
{
template <> ColumnConst<Array>::ColumnConst(size_t s_, const Array & data_) { throw Exception("Can't create ColumnConst<Array> without nested type", ErrorCodes::LOGICAL_ERROR); }
template <> ColumnConst<Array>::ColumnConst(size_t s_, const Array & data_, DataTypePtr nested_type_) : s(s_), data(data_), nested_type(nested_type_) {}
template <> ColumnPtr ColumnConst<String>::convertToFullColumn() const
{
ColumnString * res = new ColumnString;
@ -48,4 +52,5 @@ template <> ColumnPtr ColumnConst<Array>::convertToFullColumn() const
return res;
}
}