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

Added proper support for Nullable arguments for function OR #1416

Browse Source
This commit is contained in:
Alexey Milovidov 2017-12-25 09:33:51 +03:00
parent 9b914cf93e
commit 04eb0b896c
4 changed files with 158 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dbms/src/Common/FieldVisitors.h
View File

@ -3,6 +3,7 @@
#include <Core/Field.h>
#include <Core/AccurateComparison.h>
#include <common/DateLUT.h>
#include <Common/demangle.h>
class SipHash;
@ -135,22 +136,22 @@ class FieldVisitorConvertToNumber : public StaticVisitor<T>
public:
T operator() (const Null &) const
{
throw Exception("Cannot convert NULL to " + String(TypeName<T>::get()), ErrorCodes::CANNOT_CONVERT_TYPE);
throw Exception("Cannot convert NULL to " + demangle(typeid(T).name()), ErrorCodes::CANNOT_CONVERT_TYPE);
}
T operator() (const String &) const
{
throw Exception("Cannot convert String to " + String(TypeName<T>::get()), ErrorCodes::CANNOT_CONVERT_TYPE);
throw Exception("Cannot convert String to " + demangle(typeid(T).name()), ErrorCodes::CANNOT_CONVERT_TYPE);
}
T operator() (const Array &) const
{
throw Exception("Cannot convert Array to " + String(TypeName<T>::get()), ErrorCodes::CANNOT_CONVERT_TYPE);
throw Exception("Cannot convert Array to " + demangle(typeid(T).name()), ErrorCodes::CANNOT_CONVERT_TYPE);
}
T operator() (const Tuple &) const
{
throw Exception("Cannot convert Tuple to " + String(TypeName<T>::get()), ErrorCodes::CANNOT_CONVERT_TYPE);
throw Exception("Cannot convert Tuple to " + demangle(typeid(T).name()), ErrorCodes::CANNOT_CONVERT_TYPE);
}
T operator() (const UInt64 & x) const { return x; }

99
dbms/src/Functions/FunctionsLogical.h
View File

@ -3,6 +3,8 @@
#include <DataTypes/DataTypesNumber.h>
#include <Columns/ColumnsNumber.h>
#include <Columns/ColumnConst.h>
#include <Columns/ColumnNullable.h>
#include <DataTypes/DataTypeNullable.h>
#include <Common/typeid_cast.h>
#include <IO/WriteHelpers.h>
#include <Functions/IFunction.h>
@ -19,10 +21,17 @@ namespace ErrorCodes
extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
}
/** Return an UInt8 containing 0 or 1.
/** Behaviour in presence of NULLs:
*
* Functions AND, XOR, NOT use default implementation for NULLs:
* - if one of arguments is Nullable, they return Nullable result where NULLs are returned when at least one argument was NULL.
*
* But function OR is different.
* It always return non-Nullable result and NULL are equivalent to 0 (false).
* For example, 1 OR NULL returns 1, not NULL.
*/
struct AndImpl
{
static inline bool isSaturable()
@ -30,15 +39,17 @@ struct AndImpl
return true;
}
static inline bool isSaturatedValue(UInt8 a)
static inline bool isSaturatedValue(bool a)
{
return !a;
}
static inline UInt8 apply(UInt8 a, UInt8 b)
static inline bool apply(bool a, bool b)
{
return a && b;
}
static inline bool specialImplementationForNulls() { return false; }
};
struct OrImpl
@ -48,15 +59,17 @@ struct OrImpl
return true;
}
static inline bool isSaturatedValue(UInt8 a)
static inline bool isSaturatedValue(bool a)
{
return a;
}
static inline UInt8 apply(UInt8 a, UInt8 b)
static inline bool apply(bool a, bool b)
{
return a || b;
}
static inline bool specialImplementationForNulls() { return true; }
};
struct XorImpl
@ -66,15 +79,17 @@ struct XorImpl
return false;
}
static inline bool isSaturatedValue(UInt8)
static inline bool isSaturatedValue(bool)
{
return false;
}
static inline UInt8 apply(UInt8 a, UInt8 b)
static inline bool apply(bool a, bool b)
{
return (!a) != (!b);
return a != b;
}
static inline bool specialImplementationForNulls() { return false; }
};
template <typename A>
@ -170,21 +185,23 @@ private:
bool has_res = false;
for (int i = static_cast<int>(in.size()) - 1; i >= 0; --i)
{
if (in[i]->isColumnConst())
{
UInt8 x = !!in[i]->getUInt(0);
if (has_res)
{
res = Impl::apply(res, x);
}
else
{
res = x;
has_res = true;
}
if (!in[i]->isColumnConst())
continue;
in.erase(in.begin() + i);
Field value = (*in[i])[0];
UInt8 x = !value.isNull() && applyVisitor(FieldVisitorConvertToNumber<bool>(), value);
if (has_res)
{
res = Impl::apply(res, x);
}
else
{
res = x;
has_res = true;
}
in.erase(in.begin() + i);
}
return has_res;
}
@ -195,7 +212,7 @@ private:
auto col = checkAndGetColumn<ColumnVector<T>>(column);
if (!col)
return false;
const typename ColumnVector<T>::Container & vec = col->getData();
const auto & vec = col->getData();
size_t n = res.size();
for (size_t i = 0; i < n; ++i)
res[i] = !!vec[i];
@ -203,6 +220,25 @@ private:
return true;
}
template <typename T>
bool convertNullableTypeToUInt8(const IColumn * column, UInt8Container & res)
{
auto col_nullable = checkAndGetColumn<ColumnNullable>(column);
auto col = checkAndGetColumn<ColumnVector<T>>(&col_nullable->getNestedColumn());
if (!col)
return false;
const auto & vec = col->getData();
const auto & null_map = col_nullable->getNullMapData();
size_t n = res.size();
for (size_t i = 0; i < n; ++i)
res[i] = !!vec[i] && !null_map[i];
return true;
}
void convertToUInt8(const IColumn * column, UInt8Container & res)
{
if (!convertTypeToUInt8<Int8>(column, res) &&
@ -213,7 +249,17 @@ private:
!convertTypeToUInt8<UInt32>(column, res) &&
!convertTypeToUInt8<UInt64>(column, res) &&
!convertTypeToUInt8<Float32>(column, res) &&
!convertTypeToUInt8<Float64>(column, res))
!convertTypeToUInt8<Float64>(column, res) &&
!convertNullableTypeToUInt8<Int8>(column, res) &&
!convertNullableTypeToUInt8<Int16>(column, res) &&
!convertNullableTypeToUInt8<Int32>(column, res) &&
!convertNullableTypeToUInt8<Int64>(column, res) &&
!convertNullableTypeToUInt8<UInt8>(column, res) &&
!convertNullableTypeToUInt8<UInt16>(column, res) &&
!convertNullableTypeToUInt8<UInt32>(column, res) &&
!convertNullableTypeToUInt8<UInt64>(column, res) &&
!convertNullableTypeToUInt8<Float32>(column, res) &&
!convertNullableTypeToUInt8<Float64>(column, res))
throw Exception("Unexpected type of column: " + column->getName(), ErrorCodes::ILLEGAL_COLUMN);
}
@ -226,6 +272,8 @@ public:
bool isVariadic() const override { return true; }
size_t getNumberOfArguments() const override { return 0; }
bool useDefaultImplementationForNulls() const override { return !Impl::specialImplementationForNulls(); }
/// Get result types by argument types. If the function does not apply to these arguments, throw an exception.
DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
{
@ -235,7 +283,8 @@ public:
ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
for (size_t i = 0; i < arguments.size(); ++i)
if (!arguments[i]->isNumber())
if (!(arguments[i]->isNumber()
|| (Impl::specialImplementationForNulls() && (arguments[i]->onlyNull() || removeNullable(arguments[i])->isNumber()))))
throw Exception("Illegal type ("
+ arguments[i]->getName()
+ ") of " + toString(i + 1) + " argument of function " + getName(),

28
dbms/tests/queries/0_stateless/00552_or_nullable.reference Normal file
View File

@ -0,0 +1,28 @@
0 1 0 1 0 1 1 1
\N 0 1 0 0 1 0 1 1 1
1 1 1 1 1 1 1 1 1 1
\N 0 1 0 0 1 0 1 1 1
0 0 1 0 0 1 0 1 1 1
\N 0 1 0 0 1 0 1 1 1
2 1 1 1 1 1 1 1 1 1
\N 0 1 0 0 1 0 1 1 1
1 1 1 1 1 1 1 1 1 1
\N 0 1 0 0 1 0 1 1 1
0 0 1 0 0 1 0 1 1 1
\N \N \N \N \N \N \N \N \N \N
1 0 1 1 0 1 0 1 1 0
\N \N \N \N \N \N \N \N \N \N
0 0 0 0 0 0 0 0 0 0
\N \N \N \N \N \N \N \N \N \N
2 0 2 2 0 2 0 2 2 0
\N \N \N \N \N \N \N \N \N \N
1 0 1 1 0 1 0 1 1 0
\N \N \N \N \N \N \N \N \N \N
0 0 0 0 0 0 0 0 0 0
1
0
\N
1
1
\N
0

51
dbms/tests/queries/0_stateless/00552_or_nullable.sql Normal file
View File

@ -0,0 +1,51 @@
SELECT
0 OR NULL,
1 OR NULL,
toNullable(0) OR NULL,
toNullable(1) OR NULL,
0.0 OR NULL,
0.1 OR NULL,
NULL OR 1 OR NULL,
0 OR NULL OR 1 OR NULL;
SELECT
x,
0 OR x,
1 OR x,
x OR x,
toNullable(0) OR x,
toNullable(1) OR x,
0.0 OR x,
0.1 OR x,
x OR 1 OR x,
0 OR x OR 1 OR x
FROM (SELECT number % 2 ? number % 3 : NULL AS x FROM system.numbers LIMIT 10);
SELECT
x,
0 AND x,
1 AND x,
x AND x,
toNullable(0) AND x,
toNullable(1) AND x,
0.0 AND x,
0.1 AND x,
x AND 1 AND x,
0 AND x AND 1 AND x
FROM (SELECT number % 2 ? number % 3 : NULL AS x FROM system.numbers LIMIT 10);
DROP TABLE IF EXISTS test.test;
CREATE TABLE test.test
(
x Nullable(Int32)
) ENGINE = Log;
INSERT INTO test.test VALUES(1), (0), (null);
SELECT * FROM test.test;
SELECT x FROM test.test WHERE x != 0;
SELECT x FROM test.test WHERE x != 0 OR isNull(x);
SELECT x FROM test.test WHERE x != 1;
DROP TABLE test.test;