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

Merge pull request #3641 from yandex/fix-array-mapped-functions-with-low-cardinality-lambda

Browse Source 
Fix array mapped functions with low cardinality lambda
This commit is contained in:
alexey-milovidov 2018-11-23 00:40:16 +03:00 committed by GitHub
commit 12045a0e0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Columns/ColumnFunction.cpp
View File

@ -183,7 +183,7 @@ void ColumnFunction::appendArgument(const ColumnWithTypeAndName & column)
auto index = captured_columns.size();
if (!column.type->equals(*argumnet_types[index]))
throw Exception("Cannot capture column " + std::to_string(argumnet_types.size()) +
"because it has incompatible type: got " + column.type->getName() +
" because it has incompatible type: got " + column.type->getName() +
", but " + argumnet_types[index]->getName() + " is expected.", ErrorCodes::LOGICAL_ERROR);
captured_columns.push_back(column);

17
dbms/src/Functions/FunctionArrayMapped.h
View File

@ -9,6 +9,7 @@
#include <Functions/IFunction.h>
#include <Functions/FunctionHelpers.h>
#include <IO/WriteHelpers.h>
#include <DataTypes/DataTypeLowCardinality.h>
namespace DB
@ -70,7 +71,7 @@ public:
if (!array_type)
throw Exception("Argument " + toString(i + 2) + " of function " + getName() + " must be array. Found "
+ arguments[i + 1]->getName() + " instead.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
nested_types[i] = array_type->getNestedType();
nested_types[i] = removeLowCardinality(array_type->getNestedType());
}
const DataTypeFunction * function_type = checkAndGetDataType<DataTypeFunction>(arguments[0].get());
@ -121,7 +122,7 @@ public:
/// The types of the remaining arguments are already checked in getLambdaArgumentTypes.
DataTypePtr return_type = data_type_function->getReturnType();
DataTypePtr return_type = removeLowCardinality(data_type_function->getReturnType());
if (Impl::needBoolean() && !WhichDataType(return_type).isUInt8())
throw Exception("Expression for function " + getName() + " must return UInt8, found "
+ return_type->getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
@ -184,6 +185,8 @@ public:
if (!column_const_array)
throw Exception("Expected array column, found " + column_array_ptr->getName(), ErrorCodes::ILLEGAL_COLUMN);
column_array_ptr = column_const_array->convertToFullColumn();
if (column_array_ptr->lowCardinality())
column_array_ptr = column_array_ptr->convertToFullColumnIfLowCardinality();
column_array = checkAndGetColumn<ColumnArray>(column_array_ptr.get());
}
@ -209,7 +212,8 @@ public:
}
arrays.emplace_back(ColumnWithTypeAndName(column_array->getDataPtr(),
array_type->getNestedType(), array_with_type_and_name.name));
removeLowCardinality(array_type->getNestedType()),
array_with_type_and_name.name));
}
/// Put all the necessary columns multiplied by the sizes of arrays into the block.
@ -217,8 +221,11 @@ public:
auto * replicated_column_function = typeid_cast<ColumnFunction *>(replicated_column_function_ptr.get());
replicated_column_function->appendArguments(arrays);
block.getByPosition(result).column = Impl::execute(*column_first_array,
replicated_column_function->reduce().column);
auto lambda_result = replicated_column_function->reduce().column;
if (lambda_result->lowCardinality())
lambda_result = lambda_result->convertToFullColumnIfLowCardinality();
block.getByPosition(result).column = Impl::execute(*column_first_array, lambda_result);
}
}
};

10
dbms/tests/queries/0_stateless/00752_low_cardinality_lambda_argument.reference Normal file
View File

@ -0,0 +1,10 @@
[]
[0]
[0]
[0,2]
[0,2]
[0,2,4]
[0,2,4]
[0,2,4,6]
[0,2,4,6]
[0,2,4,6,8]

7
dbms/tests/queries/0_stateless/00752_low_cardinality_lambda_argument.sql Normal file
View File

@ -0,0 +1,7 @@
set allow_experimental_low_cardinality_type = 1;
drop table if exists test.lc_lambda;
create table test.lc_lambda (arr Array(LowCardinality(UInt64))) engine = Memory;
insert into test.lc_lambda select range(number) from system.numbers limit 10;
select arrayFilter(x -> x % 2 == 0, arr) from test.lc_lambda;
drop table if exists test.lc_lambda;