From a0309b57aba53536a4a8d1fbd6b3eb934c04f881 Mon Sep 17 00:00:00 2001 From: chertus Date: Wed, 5 Sep 2018 19:24:46 +0300 Subject: [PATCH] fix build with embedded compiler --- dbms/src/DataTypes/IDataType.h | 2 +- dbms/src/Functions/FunctionsComparison.h | 2 +- dbms/src/Functions/FunctionsConditional.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dbms/src/DataTypes/IDataType.h b/dbms/src/DataTypes/IDataType.h index 213f9b138ba..dc079ec93b6 100644 --- a/dbms/src/DataTypes/IDataType.h +++ b/dbms/src/DataTypes/IDataType.h @@ -442,7 +442,7 @@ inline bool isNotDecimalButComparableToDecimal(const IDataType * data_type) return data_type->isInteger(); } -inline bool isCompilable(const IDataType * data_type) +inline bool isCompilableType(const IDataType * data_type) { return data_type->isValueRepresentedByNumber() && !isDecimal(data_type); } diff --git a/dbms/src/Functions/FunctionsComparison.h b/dbms/src/Functions/FunctionsComparison.h index 3afe8e17489..e3e95a3424c 100644 --- a/dbms/src/Functions/FunctionsComparison.h +++ b/dbms/src/Functions/FunctionsComparison.h @@ -1237,7 +1237,7 @@ public: auto isFloatingPoint = &typeIsEither; if ((isBigInteger(*types[0]) && isFloatingPoint(*types[1])) || (isBigInteger(*types[1]) && isFloatingPoint(*types[0]))) return false; /// TODO: implement (double, int_N where N > double's mantissa width) - return isCompilable(types[0]) && isCompilable(types[1]); + return isCompilableType(types[0].get()) && isCompilableType(types[1].get()); } llvm::Value * compileImpl(llvm::IRBuilderBase & builder, const DataTypes & types, ValuePlaceholders values) const override diff --git a/dbms/src/Functions/FunctionsConditional.h b/dbms/src/Functions/FunctionsConditional.h index ae2cb7b498f..e8d261216f4 100644 --- a/dbms/src/Functions/FunctionsConditional.h +++ b/dbms/src/Functions/FunctionsConditional.h @@ -122,7 +122,7 @@ public: bool isCompilableImpl(const DataTypes & types) const override { for (const auto & type : types) - if (!isCompilable(removeNullable(type))) + if (!isCompilableType(removeNullable(type).get())) return false; return true; }