From ef6b20030cc6f38e3d0ba340a569d934f246f616 Mon Sep 17 00:00:00 2001 From: Vitaly Baranov Date: Tue, 12 Feb 2019 14:15:03 +0300 Subject: [PATCH] Fix compilation on Mac. --- dbms/src/Columns/ColumnDecimal.h | 2 +- dbms/src/Columns/ColumnVector.h | 2 +- dbms/src/Columns/IColumnUnique.h | 6 +++--- dbms/src/Storages/IStorage.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dbms/src/Columns/ColumnDecimal.h b/dbms/src/Columns/ColumnDecimal.h index 2bdaaf8d536..308d237c3a9 100644 --- a/dbms/src/Columns/ColumnDecimal.h +++ b/dbms/src/Columns/ColumnDecimal.h @@ -166,7 +166,7 @@ template template ColumnPtr ColumnDecimal::indexImpl(const PaddedPODArray & indexes, UInt64 limit) const { - size_t size = indexes.size(); + UInt64 size = indexes.size(); if (limit == 0) limit = size; diff --git a/dbms/src/Columns/ColumnVector.h b/dbms/src/Columns/ColumnVector.h index 7159c25aa59..da3e62aac03 100644 --- a/dbms/src/Columns/ColumnVector.h +++ b/dbms/src/Columns/ColumnVector.h @@ -275,7 +275,7 @@ template template ColumnPtr ColumnVector::indexImpl(const PaddedPODArray & indexes, UInt64 limit) const { - size_t size = indexes.size(); + UInt64 size = indexes.size(); if (limit == 0) limit = size; diff --git a/dbms/src/Columns/IColumnUnique.h b/dbms/src/Columns/IColumnUnique.h index f3567fb8760..fbb2e5625f7 100644 --- a/dbms/src/Columns/IColumnUnique.h +++ b/dbms/src/Columns/IColumnUnique.h @@ -99,7 +99,7 @@ public: throw Exception("Method deserializeAndInsertFromArena is not supported for ColumnUnique.", ErrorCodes::NOT_IMPLEMENTED); } - ColumnPtr index(const IColumn &, size_t) const override + ColumnPtr index(const IColumn &, UInt64) const override { throw Exception("Method index is not supported for ColumnUnique.", ErrorCodes::NOT_IMPLEMENTED); } @@ -114,7 +114,7 @@ public: throw Exception("Method filter is not supported for ColumnUnique.", ErrorCodes::NOT_IMPLEMENTED); } - ColumnPtr permute(const IColumn::Permutation &, size_t) const override + ColumnPtr permute(const IColumn::Permutation &, UInt64) const override { throw Exception("Method permute is not supported for ColumnUnique.", ErrorCodes::NOT_IMPLEMENTED); } @@ -124,7 +124,7 @@ public: throw Exception("Method replicate is not supported for ColumnUnique.", ErrorCodes::NOT_IMPLEMENTED); } - void getPermutation(bool, size_t, int, IColumn::Permutation &) const override + void getPermutation(bool, UInt64, int, IColumn::Permutation &) const override { throw Exception("Method getPermutation is not supported for ColumnUnique.", ErrorCodes::NOT_IMPLEMENTED); } diff --git a/dbms/src/Storages/IStorage.h b/dbms/src/Storages/IStorage.h index 7397d285b80..53adf573c52 100644 --- a/dbms/src/Storages/IStorage.h +++ b/dbms/src/Storages/IStorage.h @@ -185,7 +185,7 @@ public: const SelectQueryInfo & /*query_info*/, const Context & /*context*/, QueryProcessingStage::Enum /*processed_stage*/, - size_t /*max_block_size*/, + UInt64 /*max_block_size*/, unsigned /*num_streams*/) { throw Exception("Method read is not supported by storage " + getName(), ErrorCodes::NOT_IMPLEMENTED);