thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 15:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Addition to prev. revision [#CLICKHOUSE-3402].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-11-09 22:24:49 +03:00 committed by alexey-milovidov
parent ec5720eb66
commit ac1b69247c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbms/src/Functions/tests/logical_functions_performance.cpp
View File

@ -370,7 +370,6 @@ int main(int argc, char ** argv)
for (size_t arity = 2; arity <= columns; ++arity) for (size_t arity = 2; arity <= columns; ++arity)
{ {
FunctionPtr function = std::make_shared<FunctionAnd>(); FunctionPtr function = std::make_shared<FunctionAnd>();
function->getReturnType(DataTypes(arity, DataTypePtr(std::make_shared<DataTypeUInt8>())));
ColumnNumbers arguments(arity); ColumnNumbers arguments(arity);
for (size_t i = 0; i < arity; ++i) for (size_t i = 0; i < arity; ++i)

11
dbms/src/Storages/MergeTree/PKCondition.cpp
View File

@ -307,11 +307,13 @@ static void applyFunction(
const DataTypePtr & arg_type, const Field & arg_value, const DataTypePtr & arg_type, const Field & arg_value,
DataTypePtr & res_type, Field & res_value) DataTypePtr & res_type, Field & res_value)
{ {
res_type = func->getReturnType({arg_type}); std::vector<ExpressionAction> unused_prerequisites;
ColumnsWithTypeAndName arguments{{ arg_type->createConstColumn(1, arg_value), arg_type, "x" }};
func->getReturnTypeAndPrerequisites(arguments, res_type, unused_prerequisites);
Block block Block block
{ {
{ arg_type->createConstColumn(1, arg_value), arg_type, "x" }, arguments[0],
{ nullptr, res_type, "y" } { nullptr, res_type, "y" }
}; };
@ -435,7 +437,10 @@ bool PKCondition::isPrimaryKeyPossiblyWrappedByMonotonicFunctions(
if (!func || !func->hasInformationAboutMonotonicity()) if (!func || !func->hasInformationAboutMonotonicity())
return false; return false;
primary_key_column_type = func->getReturnType({primary_key_column_type}); std::vector<ExpressionAction> unused_prerequisites;
ColumnsWithTypeAndName arguments{{ nullptr, primary_key_column_type, "" }};
func->getReturnTypeAndPrerequisites(arguments, primary_key_column_type, unused_prerequisites);
out_functions_chain.push_back(func); out_functions_chain.push_back(func);
} }