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

dbms: Server: sync with master. [#METR-15210]

Browse Source
This commit is contained in:
Alexey Arno 2015-05-19 16:52:32 +03:00
commit 80ef06d511
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dbms/include/DB/Functions/FunctionsRound.h
View File

@ -211,13 +211,13 @@ namespace DB
if (i < size) if (i < size)
{ {
Data tmp{0}; Data tmp{0};
for (size_t j = 0; (j < data_size) && (i + j) < size; ++j) for (size_t j = 0; (j < data_size) && ((i + j) < size); ++j)
tmp[j] = in[i + j]; tmp[j] = in[i + j];
Data res; Data res;
Op::compute(tmp, mm_scale, res); Op::compute(tmp, mm_scale, res);
for (size_t j = 0; (j < data_size) && (i + j) < size; ++j) for (size_t j = 0; (j < data_size) && ((i + j) < size); ++j)
out[i + j] = in[i + j]; out[i + j] = in[i + j];
} }
} }
@ -357,6 +357,8 @@ namespace
template<typename T> template<typename T>
bool executeForType(Block & block, const ColumnNumbers & arguments, size_t result) bool executeForType(Block & block, const ColumnNumbers & arguments, size_t result)
{ {
using Op = FunctionRoundingImpl<T, rounding_mode>;
if (ColumnVector<T> * col = typeid_cast<ColumnVector<T> *>(&*block.getByPosition(arguments[0]).column)) if (ColumnVector<T> * col = typeid_cast<ColumnVector<T> *>(&*block.getByPosition(arguments[0]).column))
{ {
UInt8 precision = 0; UInt8 precision = 0;
@ -369,7 +371,7 @@ namespace
typename ColumnVector<T>::Container_t & vec_res = col_res->getData(); typename ColumnVector<T>::Container_t & vec_res = col_res->getData();
vec_res.resize(col->getData().size()); vec_res.resize(col->getData().size());
FunctionRoundingImpl<T, rounding_mode>::apply(col->getData(), PowersOf10::values[precision], vec_res); Op::apply(col->getData(), PowersOf10::values[precision], vec_res);
return true; return true;
} }
@ -379,7 +381,7 @@ namespace
if (arguments.size() == 2) if (arguments.size() == 2)
precision = getPrecision<T>(block.getByPosition(arguments[1]).column); precision = getPrecision<T>(block.getByPosition(arguments[1]).column);
T res = FunctionRoundingImpl<T, rounding_mode>::apply(col->getData(), PowersOf10::values[precision]); T res = Op::apply(col->getData(), PowersOf10::values[precision]);
ColumnConst<T> * col_res = new ColumnConst<T>(col->size(), res); ColumnConst<T> * col_res = new ColumnConst<T>(col->size(), res);
block.getByPosition(result).column = col_res; block.getByPosition(result).column = col_res;