From dc7372ab71f20cd062e3b58e92835a1c5395d329 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Tue, 8 Dec 2015 04:17:57 +0300 Subject: [PATCH] dbms: fixed error [#METR-19271]. --- dbms/include/DB/Columns/ColumnConst.h | 29 +++++++++++++++++-- .../00287_column_const_with_nan.reference | 1 + .../00287_column_const_with_nan.sql | 1 + 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 dbms/tests/queries/0_stateless/00287_column_const_with_nan.reference create mode 100644 dbms/tests/queries/0_stateless/00287_column_const_with_nan.sql diff --git a/dbms/include/DB/Columns/ColumnConst.h b/dbms/include/DB/Columns/ColumnConst.h index b6bfa226ada..125d1f2e644 100644 --- a/dbms/include/DB/Columns/ColumnConst.h +++ b/dbms/include/DB/Columns/ColumnConst.h @@ -26,6 +26,29 @@ public: }; +namespace ColumnConstDetails +{ + template + inline bool equals(const T & x, const T & y) + { + return x == y; + } + + /// Проверяет побитовую идентичность элементов, даже если они являются NaN-ами. + template <> + inline bool equals(const Float32 & x, const Float32 & y) + { + return 0 == memcmp(&x, &y, sizeof(x)); + } + + template <> + inline bool equals(const Float64 & x, const Float64 & y) + { + return 0 == memcmp(&x, &y, sizeof(x)); + } +} + + /** Столбец-константа может содержать внутри себя само значение, * или, в случае массивов, SharedPtr от значения-массива, * чтобы избежать проблем производительности при копировании очень больших массивов. @@ -65,7 +88,7 @@ public: void insertRangeFrom(const IColumn & src, size_t start, size_t length) override { - if (getDataFromHolder() != static_cast(src).getDataFromHolder()) + if (!ColumnConstDetails::equals(getDataFromHolder(), static_cast(src).getDataFromHolder())) throw Exception("Cannot insert different element into constant column " + getName(), ErrorCodes::CANNOT_INSERT_ELEMENT_INTO_CONSTANT_COLUMN); @@ -74,7 +97,7 @@ public: void insert(const Field & x) override { - if (x.get() != FieldType(getDataFromHolder())) + if (!ColumnConstDetails::equals(x.get(), FieldType(getDataFromHolder()))) throw Exception("Cannot insert different element into constant column " + getName(), ErrorCodes::CANNOT_INSERT_ELEMENT_INTO_CONSTANT_COLUMN); ++s; @@ -87,7 +110,7 @@ public: void insertFrom(const IColumn & src, size_t n) override { - if (getDataFromHolder() != static_cast(src).getDataFromHolder()) + if (!ColumnConstDetails::equals(getDataFromHolder(), static_cast(src).getDataFromHolder())) throw Exception("Cannot insert different element into constant column " + getName(), ErrorCodes::CANNOT_INSERT_ELEMENT_INTO_CONSTANT_COLUMN); ++s; diff --git a/dbms/tests/queries/0_stateless/00287_column_const_with_nan.reference b/dbms/tests/queries/0_stateless/00287_column_const_with_nan.reference new file mode 100644 index 00000000000..946573052ce --- /dev/null +++ b/dbms/tests/queries/0_stateless/00287_column_const_with_nan.reference @@ -0,0 +1 @@ +nan 1 diff --git a/dbms/tests/queries/0_stateless/00287_column_const_with_nan.sql b/dbms/tests/queries/0_stateless/00287_column_const_with_nan.sql new file mode 100644 index 00000000000..67931511ac2 --- /dev/null +++ b/dbms/tests/queries/0_stateless/00287_column_const_with_nan.sql @@ -0,0 +1 @@ +SELECT * FROM (SELECT nan, number FROM system.numbers) WHERE number % 100 = 1 LIMIT 1;