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

dbms: reverted change (was bogus) [#METR-19266]

Browse Source
This commit is contained in:
Alexey Arno 2016-08-15 20:26:06 +03:00
parent 8340f8fd07
commit e513df2e5c
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
View File

@ -33,7 +33,6 @@
#include <DB/DataStreams/AggregatingSortedBlockInputStream.h>
#include <DB/DataTypes/DataTypesNumberFixed.h>
#include <DB/DataTypes/DataTypeDate.h>
#include <DB/DataTypes/DataTypeNullable.h>
#include <DB/Common/VirtualColumnUtils.h>
@ -334,25 +333,16 @@ BlockInputStreams MergeTreeDataSelectExecutor::read(
RelativeSize size_of_universum = 0;
DataTypePtr type = data.getPrimaryExpression()->getSampleBlock().getByName(data.sampling_expression->getColumnName()).type;
DataTypePtr observed_type;
if (type.get()->isNullable())
{
const DataTypeNullable & nullable_type = static_cast<DataTypeNullable &>(*type);
observed_type = nullable_type.getNestedType();
}
else
observed_type = type;
if (typeid_cast<const DataTypeUInt64 *>(observed_type.get()))
if (typeid_cast<const DataTypeUInt64 *>(type.get()))
size_of_universum = RelativeSize(std::numeric_limits<UInt64>::max()) + 1;
else if (typeid_cast<const DataTypeUInt32 *>(observed_type.get()))
else if (typeid_cast<const DataTypeUInt32 *>(type.get()))
size_of_universum = RelativeSize(std::numeric_limits<UInt32>::max()) + 1;
else if (typeid_cast<const DataTypeUInt16 *>(observed_type.get()))
else if (typeid_cast<const DataTypeUInt16 *>(type.get()))
size_of_universum = RelativeSize(std::numeric_limits<UInt16>::max()) + 1;
else if (typeid_cast<const DataTypeUInt8 *>(observed_type.get()))
else if (typeid_cast<const DataTypeUInt8 *>(type.get()))
size_of_universum = RelativeSize(std::numeric_limits<UInt8>::max()) + 1;
else
throw Exception("Invalid sampling column type in storage parameters: " + observed_type->getName() + ". Must be unsigned integer type.",
throw Exception("Invalid sampling column type in storage parameters: " + type->getName() + ". Must be unsigned integer type.",
ErrorCodes::ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER);
if (settings.parallel_replicas_count > 1)