thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 17:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Sergey Fedorov 2014-01-22 12:50:19 +00:00
parent 1d874c5f95
commit 14620b3347
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/include/DB/DataStreams/AddingConstColumnBlockInputStream.h
View File

@ -40,7 +40,7 @@ protected:
Block res = children.back()->read();
if (!res)
return res;
ColumnPtr column_ptr = (new ColumnConst<ColumnType> (res.rows(), value, data_type))->convertToFullColumn();
ColumnPtr column_ptr = ColumnConst<ColumnType> (res.rows(), value, data_type).convertToFullColumn();
ColumnWithNameAndType column(column_ptr, data_type, column_name);
res.insert(column);

8
dbms/include/DB/Storages/IStorage.h
View File

@ -45,19 +45,19 @@ public:
/** Получить описание реального (невиртуального) столбца по его имени.
*/
virtual NameAndTypePair getRealColumn(const String &column_name) const;
virtual NameAndTypePair getRealColumn(const String & column_name) const;
/** Присутствует ли реальный (невиртуальный) столбец с таким именем.
*/
virtual bool hasRealColumn(const String &column_name) const;
virtual bool hasRealColumn(const String & column_name) const;
/** Получить описание любого столбца по его имени.
*/
virtual NameAndTypePair getColumn(const String &column_name) const;
virtual NameAndTypePair getColumn(const String & column_name) const;
/** Присутствует ли столбец с таким именем.
*/
virtual bool hasColumn(const String &column_name) const;
virtual bool hasColumn(const String & column_name) const;
const DataTypePtr getDataTypeByName(const String & column_name) const;

2
dbms/src/Storages/StorageChunkMerger.cpp
View File

@ -128,7 +128,7 @@ BlockInputStreams StorageChunkMerger::read(
/// Если в запросе только виртуальные столбцы, надо запросить хотя бы один любой другой.
if (real_column_names.size() == 0)
real_column_names.push_back((*it)->getColumnsList().begin()->first);
real_column_names.push_back(ExpressionActions::getSmallestColumn((*it)->getColumnsList()));
BlockInputStreams source_streams = (*it)->read(
real_column_names,

2
dbms/src/Storages/StorageLog.cpp
View File

@ -123,7 +123,7 @@ Block LogBlockInputStream::readImpl()
rows = res.rows();
if (rows > 0)
{
ColumnPtr column_ptr = (new ColumnConst<String> (rows, current_table.first, new DataTypeString))->convertToFullColumn();
ColumnPtr column_ptr = ColumnConst<String> (rows, current_table.first, new DataTypeString).convertToFullColumn();
ColumnWithNameAndType column(column_ptr, new DataTypeString, storage._table_column_name);
res.insert(column);
}