From e3426e39e80c3b29aef4d769f13e548f7ceb74e0 Mon Sep 17 00:00:00 2001
From: millb <mikhail.korotov.io@yandex.ru>
Date: Fri, 6 Dec 2019 18:43:50 +0300
Subject: [PATCH] Fixed bugs

---
 dbms/src/Functions/FunctionsHashing.h | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/dbms/src/Functions/FunctionsHashing.h b/dbms/src/Functions/FunctionsHashing.h
index 055acd7e30d..e24574676f1 100644
--- a/dbms/src/Functions/FunctionsHashing.h
+++ b/dbms/src/Functions/FunctionsHashing.h
@@ -712,13 +712,10 @@ private:
     template <bool first>
     void executeUUID(const IColumn * column, typename ColumnVector<ToType>::Container & vec_to)
     {
-        if (const ColumnUInt128 * col_from = checkAndGetColumn<ColumnUInt128>(column))
+        if (checkColumn<ColumnUInt128>(column) ||
+            checkColumnConst<ColumnUInt128>(column))
         {
-            executeGeneric<first>(col_from, vec_to);
-        }
-        else if (const ColumnConst * col_from_const = checkAndGetColumnConst<ColumnUInt128>(column))
-        {
-            executeGeneric<first>(col_from_const, vec_to);
+            executeGeneric<first>(column, vec_to);
         }
         else
         {
@@ -731,13 +728,10 @@ private:
     template <typename T, bool first>
     void executeDecimal(const IColumn * column, typename ColumnVector<ToType>::Container & vec_to)
     {
-        if (const ColumnDecimal<T> * col_from = checkAndGetColumn<ColumnDecimal<T>>(column))
+        if (checkColumn<ColumnDecimal<T>>(column) ||
+            checkColumnConst<ColumnDecimal<T>>(column))
         {
-            executeGeneric<first>(col_from, vec_to);
-        }
-        else if (const ColumnConst * col_from_const = checkAndGetColumnConst<ColumnDecimal<T>>(column))
-        {
-            executeGeneric<first>(col_from_const, vec_to);
+            executeGeneric<first>(column, vec_to);
         }
         else
         {
@@ -769,7 +763,7 @@ private:
         {
             for (size_t i = 0; i < column->size(); ++i)
             {
-                const ToType h = Impl::aply(column->getDataAt(i).data, column->getDataAt(i).size);
+                const ToType h = Impl::apply(column->getDataAt(i).data, column->getDataAt(i).size);
                 if (first)
                     vec_to[i] = h;
                 else