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

dbms: development [#CONV-2944].

Browse Source
This commit is contained in:
Alexey Milovidov 2012-05-30 03:30:29 +00:00
parent f018ea4aac
commit c899cd3c0d
6 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/include/DB/Columns/ColumnAggregateFunction.h
View File

@ -15,6 +15,8 @@ class ColumnAggregateFunction : public ColumnVector<AggregateFunctionPtr>
public:
std::string getName() const { return "ColumnAggregateFunction"; }
ColumnPtr cloneEmpty() const { return new ColumnAggregateFunction; };
bool isNumeric() const { return false; }
Field operator[](size_t n) const

4
dbms/src/DataStreams/NativeBlockInputStream.cpp
View File

@ -32,14 +32,10 @@ Block NativeBlockInputStream::readImpl()
readStringBinary(type_name, istr);
column.type = data_type_factory.get(type_name);
std::cerr << "read: " << column.type->getName() << std::endl;
/// Данные
column.column = column.type->createColumn();
column.type->deserializeBinary(*column.column, istr, rows);
std::cerr << "read: done" << std::endl;
if (column.column->size() != rows)
throw Exception("Cannot read all data in NativeBlockInputStream.", ErrorCodes::CANNOT_READ_ALL_DATA);

4
dbms/src/DataStreams/NativeBlockOutputStream.cpp
View File

@ -27,8 +27,6 @@ void NativeBlockOutputStream::write(const Block & block)
/// Тип
writeStringBinary(column.type->getName(), ostr);
std::cerr << "write: " << column.type->getName() << std::endl;
/// Данные
if (column.column->isConst())
{
@ -40,8 +38,6 @@ void NativeBlockOutputStream::write(const Block & block)
}
else
column.type->serializeBinary(*column.column, ostr);
std::cerr << "write: done" << std::endl;
}
}

32
dbms/src/DataTypes/DataTypeFactory.cpp
View File

@ -8,6 +8,7 @@
#include <DB/DataTypes/DataTypeDateTime.h>
#include <DB/DataTypes/DataTypeString.h>
#include <DB/DataTypes/DataTypeFixedString.h>
#include <DB/DataTypes/DataTypeAggregateFunction.h>
#include <DB/DataTypes/DataTypeFactory.h>
@ -19,21 +20,22 @@ DataTypeFactory::DataTypeFactory()
: fixed_string_regexp("^FixedString\\s*\\(\\s*(\\d+)\\s*\\)$")
{
boost::assign::insert(non_parametric_data_types)
("UInt8", new DataTypeUInt8)
("UInt16", new DataTypeUInt16)
("UInt32", new DataTypeUInt32)
("UInt64", new DataTypeUInt64)
("Int8", new DataTypeInt8)
("Int16", new DataTypeInt16)
("Int32", new DataTypeInt32)
("Int64", new DataTypeInt64)
("Float32", new DataTypeFloat32)
("Float64", new DataTypeFloat64)
("VarUInt", new DataTypeVarUInt)
("VarInt", new DataTypeVarInt)
("Date", new DataTypeDate)
("DateTime", new DataTypeDateTime)
("String", new DataTypeString)
("UInt8", new DataTypeUInt8)
("UInt16", new DataTypeUInt16)
("UInt32", new DataTypeUInt32)
("UInt64", new DataTypeUInt64)
("Int8", new DataTypeInt8)
("Int16", new DataTypeInt16)
("Int32", new DataTypeInt32)
("Int64", new DataTypeInt64)
("Float32", new DataTypeFloat32)
("Float64", new DataTypeFloat64)
("VarUInt", new DataTypeVarUInt)
("VarInt", new DataTypeVarInt)
("Date", new DataTypeDate)
("DateTime", new DataTypeDateTime)
("String", new DataTypeString)
("AggregateFunction", new DataTypeAggregateFunction)
;
}

16
dbms/src/Interpreters/Aggregator.cpp
View File

@ -669,6 +669,10 @@ void Aggregator::merge(BlockInputStreamPtr stream, AggregatedDataVariants & resu
/// Читаем все данные
while (Block block = stream->read())
{
if (!sample)
for (size_t i = 0; i < keys_size + aggregates_size; ++i)
sample.insert(block.getByPosition(i).cloneEmpty());
/// Запоминаем столбцы, с которыми будем работать
for (size_t i = 0; i < keys_size; ++i)
key_columns[i] = block.getByPosition(i).column;
@ -690,14 +694,12 @@ void Aggregator::merge(BlockInputStreamPtr stream, AggregatedDataVariants & resu
{
res.resize(aggregates_size);
for (size_t i = 0; i < aggregates_size; ++i)
res[i] = (*aggregate_columns[i])[0];
}
else
{
/// Добавляем значения
for (size_t i = 0; i < aggregates_size; ++i)
res[i]->merge(*(*aggregate_columns[i])[0]);
res[i] = aggregates[i].function->cloneEmpty();
}
/// Добавляем значения
for (size_t i = 0; i < aggregates_size; ++i)
res[i]->merge(*(*aggregate_columns[i])[0]);
}
else if (result.type == AggregatedDataVariants::KEY_64)
{

5
dbms/src/Server/TCPHandler.cpp
View File

@ -117,14 +117,13 @@ void TCPHandler::processOrdinaryQuery()
{
profiling_in->setIsCancelledCallback(boost::bind(&TCPHandler::isQueryCancelled, this));
profiling_in->setProgressCallback(boost::bind(&TCPHandler::sendProgress, this, _1, _2));
profiling_in->dumpTree(std::cerr);
}
while (true)
{
std::cerr << Poco::ThreadNumber::get() << "!" << std::endl;
dynamic_cast<IProfilingBlockInputStream &>(*state.io.in).dumpTree(std::cerr);
Block block = state.io.in->read();
std::cerr << Poco::ThreadNumber::get() << "!!" << std::endl;
sendData(block);
if (!block)
break;